Windows compilation

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

diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index 952941dc8449305b9245dc2810992e994a7c5e73..39ff23646a1bdef25890f28f702bafbda79a6624 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutLine.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:53 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  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: 2008/12/12 08:55:23 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
@@ -30,14 +45,14 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 
 
 #ifndef __bbWxLayoutLine_h__
 #define __bbWxLayoutLine_h__
 
 #include "bbtkWxBlackBox.h"
-
+#include "bbwx_EXPORT.h"
 
 
 namespace bbwx
@@ -45,8 +60,8 @@ namespace bbwx
   
 
   
-  
-  class /*BBTK_EXPORT*/ LayoutLine : public bbtk::WxBlackBox
+  //===========================================================
+  class bbwx_EXPORT LayoutLine : public bbtk::WxBlackBox
   {
     
     BBTK_BLACK_BOX_INTERFACE(LayoutLine,bbtk::WxBlackBox);
@@ -62,25 +77,27 @@ 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(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*,"");
@@ -94,8 +111,8 @@ namespace bbwx
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutLine);
   //=================================================================
   
-
-
+  
+  
 }
 
 
@@ -103,4 +120,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbtkWxLayoutLine_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS