X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.cxx;h=8fd20ab8aabc346ed71a6460097e2a09ad93a926;hb=76341a6d33e00a3358183a97ea8b8f05f17e52d6;hp=046144871ebb57227ec76f9ba5425ec52295592c;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index 0461448..8fd20ab 100644
--- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:29 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/25 06:22:53 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -88,10 +88,11 @@ namespace bbtk
 
 
   //========================================================================
-    WxGUIHtmlBrowser::WxGUIHtmlBrowser ( wxWindow *parent, wxSize size )
+    WxGUIHtmlBrowser::WxGUIHtmlBrowser ( wxWindow *parent, wxSize size,
+					 WxGUIHtmlBrowserUser* user)
       : 
-      wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
-				       // ,      mWxGUIConsole(0)
+      wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
+      mUser(user)
 
   {
     wxPanel* panel = this;
@@ -103,19 +104,19 @@ namespace bbtk
     
     mwxBackButton = new wxButton( panel, bwd_id,_T("<"),wxDefaultPosition,
 				  wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE |  wxLEFT | wxTOP | wxBOTTOM , 10 );
+    bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE );
     
     mwxForwardButton = new wxButton( panel, fwd_id,_T(">"),wxDefaultPosition,
 				     wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxForwardButton  , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10);
+    bsizer->Add ( mwxForwardButton  , 0, wxALIGN_CENTRE );
     
     mwxHomeButton = new wxButton( panel, home_id,_T("Home"),wxDefaultPosition,
 				  wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10  );
+    bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE );
     
     mwxReloadButton = new wxButton( panel, reload_id,_T("Reload"),wxDefaultPosition,
 				    wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxReloadButton  , 0, wxALIGN_CENTRE |  wxTOP | wxBOTTOM , 10  );
+    bsizer->Add ( mwxReloadButton  , 0, wxALIGN_CENTRE );
     
     /*
     mwxIncludeFileButton = new wxButton( panel, include_id,
@@ -129,7 +130,7 @@ namespace bbtk
 			    wxDefaultSize,
 			    wxTE_PROCESS_ENTER);
     mwxURL->SetLabel(_T("URL"));
-    bsizer->Add(mwxURL, 1, wxEXPAND | wxALL, 10);
+    bsizer->Add(mwxURL, 1, wxEXPAND);
 
 
 //    mwxHtmlWindow = new WxHtmlWindow(parent,html_id,this,size);
@@ -292,11 +293,23 @@ namespace bbtk
 
   //========================================================================
   void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
-  {
-    mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
+  { 
+  
+    bool go = true;
+    if (mUser) 
+      {
+	wxString file = wxPathOnly(mwxURL->GetValue());
+	file += std2wx(ConfigurationFile::GetInstance().Get_file_separator());
+	file += e.GetLinkInfo().GetHref();
+	go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
+      }
+    if (go) 
+      {
+	mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
 	UpdateURL();
-    mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
-  }
+      }
+    //    mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
+   }
   //========================================================================