X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutTab.h;h=6ed22cc60705c686acff2a683b31c1dc035cbb0f;hb=4d3619bf05342807aec39f571d94e4aea2efa38b;hp=f9d98555c811125c7f8e8ec404a5c00d2321a9a4;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h
index f9d9855..6ed22cc 100644
--- a/packages/wx/src/bbwxLayoutTab.h
+++ b/packages/wx/src/bbwxLayoutTab.h
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbwxLayoutTab.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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
@@ -54,6 +59,7 @@
 #include "bbtkWxBlackBox.h"
 #include <wx/notebook.h>
 
+#include "bbwx_EXPORT.h"
 
 namespace bbwx
 {
@@ -61,7 +67,7 @@ namespace bbwx
 
   
   
-  class /*BBTK_EXPORT*/ LayoutTab : public bbtk::WxBlackBox
+  class bbwx_EXPORT LayoutTab : public bbtk::WxBlackBox
   {
     
     BBTK_BLACK_BOX_INTERFACE(LayoutTab,bbtk::WxBlackBox);
@@ -77,14 +83,15 @@ namespace bbwx
     BBTK_DECLARE_INPUT(Orientation,std::string);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
-    
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+ 
     void Process();
-    void CreateWidget();
-    void bbUserOnShow();
+    void CreateWidget(wxWindow*);
+    void OnShowWidget();
 
   protected:
-	virtual void bbUserConstructor();
-	void TryInsertWindow(wxNotebook *book, wxWindow *widgetchild);
+    void SetTitleTabs();
+    void TryInsertWindow(wxNotebook *book, const std::string& input);
 
   };