From: vargas <vargas>
Date: Mon, 3 May 2010 08:06:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~45
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f2524bbf3fb12b80e131bbe7e11091cdf90bf780;p=bbtk.git

*** empty log message ***
---

diff --git a/packages/wx/src/bbwxCheckBox.cxx b/packages/wx/src/bbwxCheckBox.cxx
index 501a8bd..67afbb7 100644
--- a/packages/wx/src/bbwxCheckBox.cxx
+++ b/packages/wx/src/bbwxCheckBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCheckBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:03 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/05/03 08:06:14 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -55,7 +55,7 @@ namespace bbwx
     /// The other params initialize the widget 
     CheckBoxWidget(CheckBox* box, wxWindow *parent,
 		 wxString title,
-		 bool value
+		 bool value, int reactiveOnKeyStroke
                  );
     /// Dtor
     ~CheckBoxWidget();
@@ -71,7 +71,7 @@ namespace bbwx
   private:
     CheckBox*    mBox;
     wxCheckBox   *mwxCheckBox;
-
+	int _reactiveOnKeyStroke;
     bool       val;
   };
   //------------------------------------------------------------------------
@@ -83,11 +83,12 @@ namespace bbwx
   //-------------------------------------------------------------------------
   CheckBoxWidget::CheckBoxWidget(CheckBox* box, wxWindow *parent,
 			     wxString title,
-			     bool value)
+			     bool value, int reactiveOnKeyStroke)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
-    val(value)
+    val(value),
+	_reactiveOnKeyStroke(reactiveOnKeyStroke)
   {
     wxPanel * panel = this;
     int sizeX, sizeY;
@@ -145,12 +146,14 @@ namespace bbwx
   //-------------------------------------------------------------------------
   void CheckBoxWidget::OnCheckBoxClick(wxCommandEvent& event)
   {
-    // When user clicks the box 
-    // we update the output of the box
-    mBox->bbSetOutputOut( mwxCheckBox->GetValue() );
-    mBox->bbSetInputIn( mwxCheckBox->GetValue() );
-    // and signal that the output has changed
-    mBox->bbSignalOutputModification(std::string("Out"));
+	  // When user clicks the box 
+	  // we update the output of the box
+	  mBox->bbSetOutputOut( mwxCheckBox->GetValue() );
+	  mBox->bbSetInputIn( mwxCheckBox->GetValue() );
+	  // and signal that the output has changed
+	  //if(_reactiveOnKeyStroke==1){
+	  mBox->bbSignalOutputModification(std::string("Out"));
+	  //}
   }
   //-------------------------------------------------------------------------
 
@@ -182,6 +185,7 @@ namespace bbwx
 	{
 		bbSetInputIn(false);
 		bbSetOutputOut(false);
+		bbSetInputReactiveOnKeystroke(1);
 	}
 	
 	//-----------------------------------------------------------------	
@@ -207,7 +211,8 @@ namespace bbwx
     CheckBoxWidget *w =  new CheckBoxWidget(this, 
 					parent, 
 					bbtk::std2wx( bbGetInputTitle() ),
-					bbGetInputIn() 
+					bbGetInputIn(),
+					bbGetInputReactiveOnKeystroke()
 					);
     bbSetOutputWidget( w );
   }
diff --git a/packages/wx/src/bbwxCheckBox.h b/packages/wx/src/bbwxCheckBox.h
index b2b902a..9e9a550 100644
--- a/packages/wx/src/bbwxCheckBox.h
+++ b/packages/wx/src/bbwxCheckBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCheckBox.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:03 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/05/03 08:06:14 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -72,6 +72,7 @@ namespace bbwx
     BBTK_BLACK_BOX_INTERFACE(CheckBox,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,bool);
     BBTK_DECLARE_INPUT(Title,std::string);
+	BBTK_DECLARE_INPUT(ReactiveOnKeystroke,int);
     BBTK_DECLARE_OUTPUT(Out,bool);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
@@ -93,6 +94,7 @@ namespace bbwx
   BBTK_INPUT(CheckBox, In,   "Initial value of the CheckBox (default false)",bool,       "");
   BBTK_INPUT(CheckBox, Title,"Title shown above the CheckBox (default '') ", std::string,"");
   BBTK_OUTPUT(CheckBox,Out,  "Current value of the CheckBox",                bool,       "");
+  BBTK_INPUT(CheckBox,ReactiveOnKeystroke,"0: no event generated when the checkbox is clicked on, 1: event generated when the checkbox is clicked on (default 1) ", int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(CheckBox);
   //=================================================================