Feature #1774

[bbtk.git] / kernel / src / bbtkWxGUIHtmlBrowser.h

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.h b/kernel/src/bbtkWxGUIHtmlBrowser.h
index 14183b8fe1b597fba594008af20062b1e50872a9..cb97170504682e432619eda8556dabaa162ee31b 100644 (file)
--- a/kernel/src/bbtkWxGUIHtmlBrowser.h
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.h
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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/10/17 08:18:15 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 /**
@@ -58,6 +65,7 @@ namespace bbtk
 
   class WxGUIHtmlBrowser;
 
+
   class WxHtmlWindow : public virtual wxHtmlWindow
   {
   public:
@@ -69,10 +77,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 +94,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 +130,7 @@ namespace bbtk
     void OnReloadButton(wxCommandEvent& );
     //   void OnRunButton(wxCommandEvent& );
     void OnLinkClicked(wxHtmlLinkEvent& );
+       void OnLinkClicked2(const wxHtmlLinkInfo& );
     void OnURLEnter( wxCommandEvent&);
     void OnSize( wxSizeEvent&);
 
@@ -128,7 +142,7 @@ namespace bbtk
     std::string GetCurrentPage();
 
   private:
-    WxHtmlWindow* mwxHtmlWindow;
+    THE_HTML_WINDOW_CLASS * mwxHtmlWindow;
     wxTextCtrl* mwxURL;
     wxButton* mwxBackButton;
     wxButton* mwxForwardButton;