X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutSplit.h;h=b154c8e070d0446edbd4ee90d928a3ba9260898e;hb=c7d8e28b602123bc0943752e09907569f0697144;hp=a1656c177177d8f4c899d231f3f66694de869849;hpb=4858c45a868b9b0071f9980ff6be0debd5d4864c;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutSplit.h b/packages/wx/src/bbwxLayoutSplit.h
index a1656c1..b154c8e 100644
--- a/packages/wx/src/bbwxLayoutSplit.h
+++ b/packages/wx/src/bbwxLayoutSplit.h
@@ -1,20 +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: bbwxLayoutSplit.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:24:43 $
-  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: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.10 $
+=========================================================================*/
+
+/**
  */
 /**
  * \file 
@@ -26,7 +45,7 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 
 
 #ifndef __bbWxLayoutSplit_h__
@@ -35,7 +54,7 @@
 #include "bbtkWxBlackBox.h"
 #include <wx/splitter.h>
 
-
+#include "bbwx_EXPORT.h"
 
 namespace bbwx
 {
@@ -43,37 +62,40 @@ namespace bbwx
   
   
   
-  class LayoutSplit : public bbtk::WxBlackBox
+  //=================================================================
+  class bbwx_EXPORT LayoutSplit : public bbtk::WxBlackBox
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(LayoutSplit,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(LayoutSplit,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(Widget1,wxWindow*);
     BBTK_DECLARE_INPUT(Widget2,wxWindow*);
     BBTK_DECLARE_INPUT(Orientation,std::string);
     BBTK_DECLARE_INPUT(Proportion,int);
     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();
 
   };
+  //=================================================================
   
  
-//=================================================================
-// BlackBox description
+  //=================================================================
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutSplit,bbtk::WxBlackBox);
   BBTK_NAME("LayoutSplit");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Widget which splits a window in two fixed size parts (wxSplitterWindow)");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-  BBTK_INPUT(LayoutSplit,Widget1,"Upper or left widget",wxWindow*);
-  BBTK_INPUT(LayoutSplit,Widget2,"Lower or right widget",wxWindow*);
-  BBTK_INPUT(LayoutSplit,Orientation,"Orientation (default H), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string);
-   BBTK_INPUT(LayoutSplit,Proportion,"Proportion (in percent) of the first children in the window",int);
+  BBTK_INPUT(LayoutSplit,Widget1,"Upper or left widget",wxWindow*,"");
+  BBTK_INPUT(LayoutSplit,Widget2,"Lower or right widget",wxWindow*,"");
+  BBTK_INPUT(LayoutSplit,Orientation,"Orientation (default H), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string,"");
+  BBTK_INPUT(LayoutSplit,Proportion,"Proportion (in percent) of the first children in the window",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutSplit);
   //=================================================================
 }
@@ -81,4 +103,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbtkWxLayoutSplit_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS