X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.h;h=2490e8b8ef75f48a587cc3369faccff1e2565ec5;hb=c1d78c47a2cb833842ceaecb9164b9d75fed9e99;hp=9e58b1af9af64a99a694642dd98849a2f5f552cb;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git

diff --git a/packages/wx/src/bbwxCommandButton.h b/packages/wx/src/bbwxCommandButton.h
index 9e58b1a..2490e8b 100644
--- 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: 2009/05/15 14:58:03 $
+  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  
@@ -22,52 +36,32 @@
  */ 
 /** 
  * \file  
- * \brief Pattern for the definition of a new type of Node (header) 
+ * \brief 
  */ 
 /** 
- * \class bbtk::NodePatern  
- * \brief Pattern for the definition of a new type of Node  
+ * \class CommandButton
+ * \brief 
  */ 
  
  
-#ifdef _USE_WXWIDGETS_ 
+#ifdef USE_WXWIDGETS
  
 #ifndef __bbwxCommandButton_h_INCLUDED_H__ 
 #define __bbwxCommandButton_h_INCLUDED_H__ 
  
  
 #include "bbtkWxBlackBox.h" 
- 
+#include "bbwx_EXPORT.h"
  
  
 namespace bbwx 
 { 
-  class CommandButton;
   
   //--------------------------------------------------------------------------
-  class CommandButtonWidget : public wxPanel
-  {
-  public:
-    CommandButtonWidget(CommandButton* box, wxWindow *parent, 
-			wxString title);
-    ~CommandButtonWidget();
-    void OnCommandButton( wxEvent& );
-    void SetLabel(wxString title);
-    void SetColour(wxColour color);
-	
-  private:
-    CommandButton* mBox;
-    wxButton	*mwxCommandButton;
-  }; 
-   
-  //--------------------------------------------------------------------------
-  //--------------------------------------------------------------------------
-  //--------------------------------------------------------------------------
-
-  class /*BBTK_EXPORT*/ CommandButton : public bbtk::WxBlackBox 
+  class bbwx_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,35 +69,34 @@ namespace bbwx
     BBTK_PROCESS(Process); 
     void Process(); 
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
   protected: 
-    virtual void bbUserConstructor(); 
     
     
   private: 
     void UpdateColour();
     void UpdateLabel();
   }; 
-    
+  
   //================================================================= 
   // UserBlackBox description 
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(CommandButton,bbtk::WxBlackBox); 
   BBTK_NAME("CommandButton"); 
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); 
   BBTK_DESCRIPTION("Button which executes bbi commands"); 
-
+  
   typedef std::vector<double> vectorcolour;
   
   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); 
   //================================================================= 
- 
- 
+  
+  
 }//namespace  bbwx 
- 
+
 #endif  // __bbwxCommandButton_h_INCLUDED_H__ 
- 
-#endif //_USE_WXWIDGETS_ 
+
+#endif //USE_WXWIDGETS