X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.cxx;h=76f3e9b448d1135297009d959774d00c12173553;hb=9d5a41aa77e7749118fc4885f7b26ea25bd90629;hp=6e474755eedae40cdc0c38055617dfa7c8aeed7b;hpb=5934ccb7ca0fabdbe6c1907b2aea3696e19a0251;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index 6e47475..76f3e9b 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/04/22 14:30:25 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/10/08 13:39:33 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -73,6 +73,17 @@ namespace bbtk
 */
 
 
+//EED2  BEGIN_EVENT_TABLE(WxHtmlWindow, wxPanel)
+//EED2    EVT_SIZE(WxHtmlWindow::OnSize)
+//EED2  END_EVENT_TABLE()
+
+//EED2  void WxHtmlWindow::OnSize( wxSizeEvent& )
+//EED2  {
+//EED2		printf("EED WxHtmlWindow::OnSize  \n" );
+//EED2		Scroll(10,500);
+//EED2  }
+
+
   //========================================================================
   
   BEGIN_EVENT_TABLE(WxGUIHtmlBrowser, wxPanel)
@@ -83,6 +94,8 @@ namespace bbtk
   //    EVT_BUTTON(include_id, WxGUIHtmlBrowser::OnIncludeFileButton )
     EVT_TEXT_ENTER(url_id, WxGUIHtmlBrowser::OnURLEnter )
     EVT_HTML_LINK_CLICKED(html_id, WxGUIHtmlBrowser::OnLinkClicked)
+    EVT_SIZE(WxGUIHtmlBrowser::OnSize)
+
   END_EVENT_TABLE()
   //========================================================================
 
@@ -206,7 +219,7 @@ namespace bbtk
   void WxGUIHtmlBrowser::GoHome()
   {
     std::string url = ConfigurationFile::GetInstance().Get_doc_path();
-    url += "/bbtkWebSite/menu.html";
+    url += "/bbtkWebSite/help_contents.html";
 	GoTo(url);
 
     mwxURL->Clear();
@@ -294,10 +307,13 @@ namespace bbtk
     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 ) );
+	*/
+		wxString file = e.GetLinkInfo().GetHref();
+		go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
       }
     if (go) 
       {
@@ -309,6 +325,22 @@ namespace bbtk
   //========================================================================
 
 
+  //========================================================================
+  void WxGUIHtmlBrowser::OnSize(wxSizeEvent& e)
+  { 
+	  mwxHtmlWindow->EnableScrolling(true,true);
+	  if   (  mwxURL->GetValue()!=wxString(_T(""))  )
+	  {
+// ??????????   No funciona ....?????
+//EED2		mwxHtmlWindow->LoadPage(mwxURL->GetValue());
+//		printf("EED WxGUIHtmlBrowser::OnSize %s \n", mwxURL->GetValue().c_str() );
+//EED2		mwxHtmlWindow->Scroll( 10,  500);
+	  } else {
+//		GoHome();
+	  }
+	  e.Skip(true);
+  }
+
   /*
   void WxGUIHtmlBrowser::OnCell(wxHtmlCellEvent& )
   {