X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.h;h=174258cb16f17c0ff89fc71211b546774a2b7f95;hb=8dd53a72bc1dd1ca2c6e2763c0aeb51c77ee352e;hp=14183b8fe1b597fba594008af20062b1e50872a9;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.h b/kernel/src/bbtkWxGUIHtmlBrowser.h
index 14183b8..174258c 100644
--- a/kernel/src/bbtkWxGUIHtmlBrowser.h
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:15 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/11/24 15:45:48 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -58,6 +58,7 @@ namespace bbtk
 
   class WxGUIHtmlBrowser;
 
+
   class WxHtmlWindow : public virtual wxHtmlWindow
   {
   public:
@@ -69,10 +70,11 @@ namespace bbtk
     		  _T("bbtk::WxGUIHtmlBrowser")),
 	      mBrowser(browser)
     {
+		std::cout << "ctor"<<std::endl;
      SetBorders(30);
     };
     //    wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,const wxString& url, wxString *redirect);
-//EED    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
+//   virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
 
 //EED2  void OnSize( wxSizeEvent&);
 
@@ -85,7 +87,11 @@ namespace bbtk
 
   };
 
+//	typedef wxHtmlWindow WxHtmlWindow;
   
+	
+#define THE_HTML_WINDOW_CLASS wxHtmlWindow
+	
   /// Abstract class which defines the callbacks invoked by WxGUIHtmlBrowser
   class WxGUIHtmlBrowserUser 
   {
@@ -117,6 +123,7 @@ namespace bbtk
     void OnReloadButton(wxCommandEvent& );
     //   void OnRunButton(wxCommandEvent& );
     void OnLinkClicked(wxHtmlLinkEvent& );
+	void OnLinkClicked2(const wxHtmlLinkInfo& );
     void OnURLEnter( wxCommandEvent&);
     void OnSize( wxSizeEvent&);
 
@@ -128,7 +135,7 @@ namespace bbtk
     std::string GetCurrentPage();
 
   private:
-    WxHtmlWindow* mwxHtmlWindow;
+    THE_HTML_WINDOW_CLASS * mwxHtmlWindow;
     wxTextCtrl* mwxURL;
     wxButton* mwxBackButton;
     wxButton* mwxForwardButton;