X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCheckBox.cxx;h=48d209128460cd25edd4fa75c15dc5a403bc4c82;hb=8ba18df584ba0a409fb042663be9fa76ccb0e0b0;hp=67afbb7666c934dbbcf34f910830d2c5daee660c;hpb=f2524bbf3fb12b80e131bbe7e11091cdf90bf780;p=bbtk.git

diff --git a/packages/wx/src/bbwxCheckBox.cxx b/packages/wx/src/bbwxCheckBox.cxx
index 67afbb7..48d2091 100644
--- a/packages/wx/src/bbwxCheckBox.cxx
+++ b/packages/wx/src/bbwxCheckBox.cxx
@@ -1,9 +1,36 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbwxCheckBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/05/03 08:06:14 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -44,41 +71,7 @@
 #include "bbtkUtilities.h"
 
 namespace bbwx
-{
-  //--------------------------------------------------------------------------
-  // The widget created by the box 
-  class CheckBoxWidget : public wxPanel 
-  {
-  public:
-    /// Ctor with the two first params the parent window and the creator box
-    /// which must be passed to the WxBlackBoxWidget constructor.
-    /// The other params initialize the widget 
-    CheckBoxWidget(CheckBox* box, wxWindow *parent,
-		 wxString title,
-		 bool value, int reactiveOnKeyStroke
-                 );
-    /// Dtor
-    ~CheckBoxWidget();
-    /// Events callbacks
-    /// Called when the box is clicked
-    void OnCheckBoxClick(wxCommandEvent& event);
-
-    // Accessors
-    bool GetValue() { return mwxCheckBox->GetValue(); }
-    void SetValue(bool val);
-    // Update the texts which display the min/max/current values of the slider
-	
-  private:
-    CheckBox*    mBox;
-    wxCheckBox   *mwxCheckBox;
-	int _reactiveOnKeyStroke;
-    bool       val;
-  };
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-
-  
+{ 
     
   //-------------------------------------------------------------------------
   CheckBoxWidget::CheckBoxWidget(CheckBox* box, wxWindow *parent,
@@ -87,8 +80,8 @@ namespace bbwx
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
-    val(value),
-	_reactiveOnKeyStroke(reactiveOnKeyStroke)
+    _reactiveOnKeyStroke(reactiveOnKeyStroke),
+    val(value)
   {
     wxPanel * panel = this;
     int sizeX, sizeY;
@@ -146,7 +139,12 @@ namespace bbwx
   //-------------------------------------------------------------------------
   void CheckBoxWidget::OnCheckBoxClick(wxCommandEvent& event)
   {
-	  // When user clicks the box 
+  	OnCheckBoxClick_();
+  }
+  //-------------------------------------------------------------------------
+  void CheckBoxWidget::OnCheckBoxClick_()
+  {
+  // When user clicks the box 
 	  // we update the output of the box
 	  mBox->bbSetOutputOut( mwxCheckBox->GetValue() );
 	  mBox->bbSetInputIn( mwxCheckBox->GetValue() );
@@ -156,8 +154,6 @@ namespace bbwx
 	  //}
   }
   //-------------------------------------------------------------------------
-
-  //-------------------------------------------------------------------------
   
 
   //-------------------------------------------------------------------------