Feature #1774

[bbtk.git] / packages / wx / src / bbwxLayoutLine.h

diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index 50ee0c04b26c77c2cc1ce1ba7954b498e86c6b83..7b602e01925a2997697137106d7c73ab86ae518a 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.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: bbwxLayoutLine.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/13 14:46:46 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  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
@@ -45,14 +50,14 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 
 
 #ifndef __bbWxLayoutLine_h__
 #define __bbWxLayoutLine_h__
 
 #include "bbtkWxBlackBox.h"
-
+#include "bbwx_EXPORT.h"
 
 
 namespace bbwx
@@ -60,8 +65,8 @@ namespace bbwx
   
 
   
-  
-  class /*BBTK_EXPORT*/ LayoutLine : public bbtk::WxBlackBox
+  //===========================================================
+  class bbwx_EXPORT LayoutLine : public bbtk::WxBlackBox
   {
     
     BBTK_BLACK_BOX_INTERFACE(LayoutLine,bbtk::WxBlackBox);
@@ -80,24 +85,23 @@ namespace bbwx
     BBTK_ON_SHOW_WIDGET(OnShowWidget);
  
     void Process();
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
     void OnShowWidget();
     
   protected:
-       virtual void bbUserConstructor();
        void TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer);
 
   };
+  //===========================================================
   
  
-//=================================================================
-// BlackBox description
+  //=================================================================
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutLine,bbtk::WxBlackBox);
   BBTK_NAME("LayoutLine");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("LayoutLine widget (wxBoxSizer)");
-  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-  
+  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");  
   BBTK_INPUT(LayoutLine,Widget1,"widget 1",wxWindow*,"");
   BBTK_INPUT(LayoutLine,Widget2,"widget 2",wxWindow*,"");
   BBTK_INPUT(LayoutLine,Widget3,"widget 3",wxWindow*,"");
@@ -111,8 +115,8 @@ namespace bbwx
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutLine);
   //=================================================================
   
-
-
+  
+  
 }
 
 
@@ -120,4 +124,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbtkWxLayoutLine_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS