X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=66058c39062b91b7dfaa87d00eaa4beb6b34e020;hb=315c4b62d90c40f8cccd821a5ba961bf51367bb0;hp=20a7e441366668bd8d3b6558ec516da05e466a56;hpb=c1d78c47a2cb833842ceaecb9164b9d75fed9e99;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index 20a7e44..66058c3 100644
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/04/08 14:36:32 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2011/07/22 12:30:31 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -52,6 +52,9 @@ namespace bbwx
     ~InputTextWidget();
 
     std::string GetValue();
+	void SetValue(std::string value);
+
+    void OnTextEnter(wxCommandEvent& event);
     void OnTextUpdate(wxCommandEvent& event);
 
     void SetTitle(wxString);
@@ -75,28 +78,25 @@ namespace bbwx
   {
     wxPanel			*panel	= this;
     
-    mwxTextCtrl = new wxTextCtrl( panel, -1, In,
-				  wxDefaultPosition, wxSize(800,20));
+    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(800,20),wxTE_PROCESS_ENTER);
+    Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER, 
+	     (wxObjectEventFunction) 
+	     (wxEventFunction)
+	     (wxCommandEventFunction) 
+	     (void (wxPanel::*)(wxCommandEvent&))
+	     &InputTextWidget::OnTextEnter ); 
 
-    // The following was supposed to generate an event, only on ENTER key ...
-    // ... but nothing happens (no event at all ?!?)			  
-    //Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER,
-    
-     Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_UPDATED,     
+    Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_UPDATED, 
 	     (wxObjectEventFunction) 
 	     (wxEventFunction)
 	     (wxCommandEventFunction) 
 	     (void (wxPanel::*)(wxCommandEvent&))
 	     &InputTextWidget::OnTextUpdate ); 
 
+
     wxFlexGridSizer *sizer	= new wxFlexGridSizer(1);
-    /*
-      if (title!=_T(""))
-      {
-    */
     mwxTitle = new wxStaticText(panel, -1, title ); 
     sizer-> Add( mwxTitle ); 
-    //	  }
     sizer-> Add( mwxTextCtrl, 1, wxGROW ); 
     sizer-> AddGrowableCol(0);
     
@@ -124,15 +124,33 @@ namespace bbwx
   { 
     return bbtk::wx2std ( mwxTextCtrl->GetValue() );
   }
-
+	
+  void InputTextWidget::SetValue(std::string value)
+  { 
+	mwxTextCtrl->SetValue( bbtk::std2wx(value) ) ;
+  }
+	
   //--------------------------------------------------------------------------
   void InputTextWidget::OnTextUpdate(wxCommandEvent& event)
   {
-    mBox->bbSetOutputOut( GetValue() );
-    mBox->bbSetInputIn( GetValue() );
-    mBox->bbSignalOutputModification("Out");
+	if (mBox->bbGetInputReactiveOnKeystroke()==2){
+	    mBox->bbSetOutputOut( GetValue() );
+	    mBox->bbSetInputIn( GetValue() );
+	    mBox->bbSignalOutputModification("Out");
+	}
   }
 
+  //--------------------------------------------------------------------------
+  void InputTextWidget::OnTextEnter(wxCommandEvent& event)
+  {
+	if (mBox->bbGetInputReactiveOnKeystroke()==1){
+	    mBox->bbSetOutputOut( GetValue() );
+		mBox->bbSetInputIn( GetValue() );
+		mBox->bbSignalOutputModification("Out");
+	}
+  }
+
+
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------
   //--------------------------------------------------------------------------
@@ -145,9 +163,11 @@ namespace bbwx
 	//-----------------------------------------------------------------	
 	void InputText::bbUserSetDefaultValues()
 	{
+		firsttime=true;
 		bbSetInputTitle("");
 		bbSetInputIn("");
 		bbSetOutputWidget(0);
+		bbSetInputReactiveOnKeystroke(2);
 	}
 	
 	//-----------------------------------------------------------------	
@@ -167,10 +187,16 @@ namespace bbwx
     InputTextWidget *w=(InputTextWidget *)bbGetOutputWidget();
 	if (w) 
 	{
-		bbSetInputIn( w->GetValue() );
+		if (firsttime==true)
+		{
+			firsttime=false;
+			w->SetValue(  bbGetInputIn().c_str() );
+		}
 		w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
+		bbSetOutputOut( w->GetValue() );
+	} else {
+	  bbSetOutputOut( "<VOID>" );
 	}
-	bbSetOutputOut( bbGetInputIn() );
   }