Clean code

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

diff --git a/packages/wx/src/bbwxRadioButton.h b/packages/wx/src/bbwxRadioButton.h
index f6764e49231d45b84ca2ec517de64213da6994ec..16a33d67db98a1945bb3b830f3c75bfc6875dc1c 100644 (file)
--- a/packages/wx/src/bbwxRadioButton.h
+++ b/packages/wx/src/bbwxRadioButton.h
@@ -1,20 +1,39 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbwxRadioButton.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.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -39,6 +58,8 @@
 #define __bbWxRadioButton_h__
 
 #include "bbtkWxBlackBox.h"
+#include "bbwx_EXPORT.h"
+
 
 // Namespace of the package "wx" is "bbwx" 
 // Namespace associated to packages should be of the form :
@@ -47,39 +68,10 @@ namespace bbwx
 {
   
   
-  
-  
-  class RadioButton;
-  
-  //--------------------------------------------------------------------------
-  // The widget created by the box 
-  class RadioButtonWidget : public wxPanel
-  {
-  public:
-    RadioButtonWidget( RadioButton* box, wxWindow *parent, 
-                      int In, 
-                      wxString title, 
-                      std::vector<wxString> lstIn );
-
-    ~RadioButtonWidget();
-
-    int GetValue();
-    void OnRadioButton(wxEvent& event);
-
-  private:
-    RadioButton      *mBox;
-    int                     MAX_RADIOBUTTON;
-    wxRadioButton    *mwxRadioButton[10];
-  };
-  
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-
-  class /*BBTK_EXPORT*/ RadioButton : public bbtk::WxBlackBox
+  class bbwx_EXPORT RadioButton : public bbtk::WxBlackBox
   {
 
-    BBTK_USER_BLACK_BOX_INTERFACE(RadioButton,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(RadioButton,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,int);
     BBTK_DECLARE_INPUT(In0,std::string);
     BBTK_DECLARE_INPUT(In1,std::string);
@@ -96,10 +88,9 @@ namespace bbwx
     BBTK_CREATE_WIDGET(CreateWidget);
     BBTK_PROCESS(Process);
     void Process();
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
 
   protected:
-    virtual void bbUserConstructor();
 
   };
  
@@ -109,7 +100,7 @@ namespace bbwx
   BBTK_NAME("RadioButton");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("RadioButton group widget 0-9 entries");
-  BBTK_INPUT(RadioButton,In,"Set initial item",int,"");
+  BBTK_INPUT(RadioButton,In,"(default 0) Set initial item",int,"");
 
   BBTK_INPUT(RadioButton,In0,"option 0",std::string,"");
   BBTK_INPUT(RadioButton,In1,"option 1",std::string,"");