X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.h;h=cb97170504682e432619eda8556dabaa162ee31b;hb=87efce51877a540d943b1aa26307994b38bba55b;hp=885dad03481f2aada0ca11c2447042269c1e7136;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.h b/kernel/src/bbtkWxGUIHtmlBrowser.h
index 885dad0..cb97170 100644
--- a/kernel/src/bbtkWxGUIHtmlBrowser.h
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.h
@@ -1,20 +1,42 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:29 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.8 $
+=========================================================================*/
+
+
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -43,6 +65,7 @@ namespace bbtk
 
   class WxGUIHtmlBrowser;
 
+
   class WxHtmlWindow : public virtual wxHtmlWindow
   {
   public:
@@ -54,36 +77,49 @@ 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&);
+
 
   private: 
     WxGUIHtmlBrowser* mBrowser;
 
+   // any class wishing to process wxWidgets events must use this macro
+//EED2    DECLARE_EVENT_TABLE()  
 
   };
 
-  /*
+//	typedef wxHtmlWindow WxHtmlWindow;
+  
+	
+#define THE_HTML_WINDOW_CLASS wxHtmlWindow
+	
   /// Abstract class which defines the callbacks invoked by WxGUIHtmlBrowser
   class WxGUIHtmlBrowserUser 
   {
   public :
     WxGUIHtmlBrowserUser() {}
-    ~WxGUIHtmlBrowserUser() {}
+    virtual ~WxGUIHtmlBrowserUser() {}
+    
+    virtual bool WxGUIHtmlBrowserUserOnLinkClicked(const std::string& target) 
+    { return true; }
   };
-  */
+  
  
 
   // class WxGUIConsole;
 
   
-  class WxGUIHtmlBrowser : public wxPanel
+  class BBTK_EXPORT WxGUIHtmlBrowser : public wxPanel
   {
   public:
-    WxGUIHtmlBrowser ( wxWindow *parent, wxSize size ); 
-    //		       WxGUIHtmlBrowserUser* = 0 );
+    WxGUIHtmlBrowser ( wxWindow *parent, wxSize size, 
+    		       WxGUIHtmlBrowserUser* = 0 );
  
     bool GoTo(std::string&);
     void GoHome();
@@ -94,7 +130,10 @@ namespace bbtk
     void OnReloadButton(wxCommandEvent& );
     //   void OnRunButton(wxCommandEvent& );
     void OnLinkClicked(wxHtmlLinkEvent& );
+	void OnLinkClicked2(const wxHtmlLinkInfo& );
     void OnURLEnter( wxCommandEvent&);
+    void OnSize( wxSizeEvent&);
+
     void UpdateURL();
     //  void OnCell(wxHtmlCellEvent& );
 
@@ -103,7 +142,7 @@ namespace bbtk
     std::string GetCurrentPage();
 
   private:
-    WxHtmlWindow* mwxHtmlWindow;
+    THE_HTML_WINDOW_CLASS * mwxHtmlWindow;
     wxTextCtrl* mwxURL;
     wxButton* mwxBackButton;
     wxButton* mwxForwardButton;
@@ -111,7 +150,7 @@ namespace bbtk
     wxButton* mwxReloadButton;
     //    wxButton* mwxRunButton;
     
-    //  WxGUIHtmlBrowserUser* mUser;
+    WxGUIHtmlBrowserUser* mUser;
     
    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()