X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.cxx;h=e6db9eaa82687212724579983cb68a66e0ee2148;hb=468921bcc742dff540a5becedc6c045c26651f99;hp=3ac89b63a291b462d273c882149570a3c42a3dde;hpb=e4149b56dda0cfb15427533e6f573f09cd3ff74b;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index 3ac89b6..e6db9ea 100644
--- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
@@ -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.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:48 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 /**
@@ -116,7 +123,7 @@ namespace bbtk
 
   {
     wxPanel* panel = this;
-    
+
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     
     
@@ -172,18 +179,21 @@ namespace bbtk
     mwxHtmlWindow->SetBorders(5);
     //  mwxHtmlWindow->FitInside();
 
-    wxStaticBoxSizer* hw = 
-      new wxStaticBoxSizer( new wxStaticBox( this, -1, _T(""),
-					     wxDefaultPosition, 
-					     size ),
-			    wxVERTICAL );
-
-	  hw->Add ( mwxHtmlWindow, 1, wxEXPAND  );
-
-    sizer->Add ( bsizer , 0, wxEXPAND );
-    sizer->Add ( hw, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
+	sizer->Add ( bsizer , 0, wxEXPAND );
+	  
+// EED: This have a problem in macOS
+//    wxStaticBoxSizer* hw = 
+//	    new wxStaticBoxSizer( 
+//							   new wxStaticBox( this, -1, _T(""),  wxDefaultPosition,  size ), 
+//							  wxVERTICAL 
+//	                         );
+//	  hw->Add ( mwxHtmlWindow, 1, wxEXPAND  );	  
+//EED    sizer->Add ( hw, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
+	  
+    sizer->Add ( mwxHtmlWindow, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
 
     panel	-> SetSizer(sizer);
+
     panel	-> SetAutoLayout(true);
     panel	-> Layout();
 
@@ -290,7 +300,7 @@ namespace bbtk
 	//========================================================================
 	void WxGUIHtmlBrowser::OnLinkClicked2(const wxHtmlLinkInfo& info)
 	{
-		std::cout << "OLK2"<<std::endl;
+	  //		std::cout << "OLK2"<<std::endl;
 		bool go = true;
 		if (mUser) 
 		{
@@ -309,7 +319,7 @@ namespace bbtk
   //========================================================================
   void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
   { 
-	  std::cout << "OLK"<<std::endl;
+    //	  std::cout << "OLK"<<std::endl;
     bool go = true;
     if (mUser) 
       {
@@ -360,7 +370,6 @@ namespace bbtk
   //========================================================================
   void WxGUIHtmlBrowser::UpdateURL()
   {
-
     wxString s = mwxHtmlWindow->GetOpenedPage();
     if (!mwxHtmlWindow->GetOpenedAnchor().IsEmpty())
     {