New widget pipeline processing : should be almost ok

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

diff --git a/packages/wx/src/bbwxCommandButton.h b/packages/wx/src/bbwxCommandButton.h
index 9e58b1af9af64a99a694642dd98849a2f5f552cb..36a4f9c66b13ba89153c734dc6bf580deb9146c8 100644 (file)
--- a/packages/wx/src/bbwxCommandButton.h
+++ b/packages/wx/src/bbwxCommandButton.h
@@ -1,20 +1,34 @@
-/*========================================================================= 
-                                                                                 
-  Program:   bbtk 
-  Module:    $RCSfile: bbwxCommandButton.h,v $ 
-  Language:  C++ 
-  Date:      $Date: 2008/04/08 06:59:32 $ 
-  Version:   $Revision: 1.2 $ 
-                                                                                 
-  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. 
-                                                                                 
-=========================================================================*//** 
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbwxCommandButton.h,v $
+  Language:  C++
+  Date:      $Date: 2008/11/24 15:45:51 $
+  Version:   $Revision: 1.7 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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  
@@ -67,7 +81,7 @@ namespace bbwx
   class /*BBTK_EXPORT*/ CommandButton : public bbtk::WxBlackBox 
   {     
     friend class CommandButtonWidget;
-    BBTK_USER_BLACK_BOX_INTERFACE(CommandButton,bbtk::WxBlackBox); 
+    BBTK_BLACK_BOX_INTERFACE(CommandButton,bbtk::WxBlackBox); 
     BBTK_DECLARE_INPUT(In, std::string );      
     BBTK_DECLARE_INPUT(Label, std::string ); 
     BBTK_DECLARE_INPUT(Colour, std::vector<double> );  
@@ -75,7 +89,7 @@ namespace bbwx
     BBTK_PROCESS(Process); 
     void Process(); 
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
   protected: 
     virtual void bbUserConstructor(); 
     
@@ -96,7 +110,7 @@ namespace bbwx
   
   BBTK_INPUT(CommandButton,In,"Commands to be executed separated by commas (;). Each single quote (') is replaced by a double quote (\").",std::string,"");   
   BBTK_INPUT(CommandButton,Label,"Label of the button",std::string,""); 
-  BBTK_INPUT(CommandButton,Colour,"Colour of the button (-1 -1 -1  Background)",vectorcolour,"color"); 
+  BBTK_INPUT(CommandButton,Colour,"Colour of the button (-1 -1 -1  Background)",vectorcolour,"colour"); 
   //   BBTK_OUTPUT(CommandButton,Out,"..Out..",int); 
   BBTK_END_DESCRIBE_BLACK_BOX(CommandButton); 
   //=================================================================