X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.h;h=aa4ac32c26fa24d1a9e7e73c0c71159548aef2dc;hb=041e81cf4409a7c4ff5115f4b8322f14d3e8408f;hp=36a4f9c66b13ba89153c734dc6bf580deb9146c8;hpb=e4149b56dda0cfb15427533e6f573f09cd3ff74b;p=bbtk.git

diff --git a/packages/wx/src/bbwxCommandButton.h b/packages/wx/src/bbwxCommandButton.h
index 36a4f9c..aa4ac32 100644
--- a/packages/wx/src/bbwxCommandButton.h
+++ b/packages/wx/src/bbwxCommandButton.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: bbwxCommandButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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 
  *  
@@ -36,49 +41,29 @@
  */ 
 /** 
  * \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_BLACK_BOX_INTERFACE(CommandButton,bbtk::WxBlackBox); 
@@ -91,21 +76,20 @@ namespace bbwx
     BBTK_CREATE_WIDGET(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,"");   
@@ -114,10 +98,10 @@ namespace bbwx
   //	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