X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutTab.h;h=04db62d7f8966758330aee64a8d4f9eead9e1455;hb=c1d78c47a2cb833842ceaecb9164b9d75fed9e99;hp=ed3cd476dc8b41ce5ddd2644bd636280dcca862f;hpb=b1e652b50fd57dc8d52560a84211d3f9a02fbaf5;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h
index ed3cd47..04db62d 100644
--- a/packages/wx/src/bbwxLayoutTab.h
+++ b/packages/wx/src/bbwxLayoutTab.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/19 18:31:36 $
-  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: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.11 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
@@ -39,6 +54,7 @@
 #include "bbtkWxBlackBox.h"
 #include <wx/notebook.h>
 
+#include "bbwx_EXPORT.h"
 
 namespace bbwx
 {
@@ -46,10 +62,10 @@ namespace bbwx
 
   
   
-  class /*BBTK_EXPORT*/ LayoutTab : public bbtk::WxBlackBox
+  class bbwx_EXPORT LayoutTab : public bbtk::WxBlackBox
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(LayoutTab,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(LayoutTab,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(Widget1,wxWindow*);
     BBTK_DECLARE_INPUT(Widget2,wxWindow*);
     BBTK_DECLARE_INPUT(Widget3,wxWindow*);
@@ -62,13 +78,14 @@ 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 CreateWidget(wxWindow*);
+    void OnShowWidget();
+
   protected:
-	virtual void bbUserConstructor();
-	void TryInsertWindow(wxNotebook *book, wxWindow *widgetchild);
+    void TryInsertWindow(wxNotebook *book, const std::string& input);
 
   };
   
@@ -78,18 +95,20 @@ namespace bbwx
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutTab,bbtk::WxBlackBox);
   BBTK_NAME("LayoutTab");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("LayoutTab widget (wxNotebook)");
+  BBTK_DESCRIPTION("LayoutTab widget (wxNotebook) The label of each 'note book'  will be the name of the object it contains");
     // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-    BBTK_INPUT(LayoutTab,Widget1,"widget 1",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget2,"widget 2",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget3,"widget 3",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget4,"widget 4",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget5,"widget 5",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget6,"widget 6",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget7,"widget 7",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget8,"widget 8",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget9,"widget 9",wxWindow*);
-    BBTK_INPUT(LayoutTab,Orientation,"Orientation (default T), 0=T=TOP , 1=R=RIGHT , 2=B=BOTTON , 3=L=LEFT " ,std::string);
+    BBTK_INPUT(LayoutTab,Widget1,"widget 1",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget2,"widget 2",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget3,"widget 3",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget4,"widget 4",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget5,"widget 5",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget6,"widget 6",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget7,"widget 7",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget8,"widget 8",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget9,"widget 9",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Orientation,
+	       "Orientation (default T), 0=T=TOP , 1=R=RIGHT , 2=B=BOTTON , 3=L=LEFT " 
+	       ,std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutTab);
   //=================================================================