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

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.h b/kernel/src/bbtkWxGUIHtmlBrowser.h
index 885dad0..14183b8 100644
--- a/kernel/src/bbtkWxGUIHtmlBrowser.h
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   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: 2008/10/17 08:18:15 $
+  Version:   $Revision: 1.6 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -54,36 +69,44 @@ namespace bbtk
     		  _T("bbtk::WxGUIHtmlBrowser")),
 	      mBrowser(browser)
     {
-     
-    }
+     SetBorders(30);
+    };
     //    wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,const wxString& url, wxString *redirect);
 //EED    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()  
 
   };
 
-  /*
+  
   /// 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();
@@ -95,6 +118,8 @@ namespace bbtk
     //   void OnRunButton(wxCommandEvent& );
     void OnLinkClicked(wxHtmlLinkEvent& );
     void OnURLEnter( wxCommandEvent&);
+    void OnSize( wxSizeEvent&);
+
     void UpdateURL();
     //  void OnCell(wxHtmlCellEvent& );
 
@@ -111,7 +136,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()