X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=cc7c72497c22e811b53bdbb7e99471aa0c182bac;hb=fb65ef0feb38b84723ea928ec3d3c056ba26274e;hp=e9e2ab737f876eb5a7ce97a149d2be6164ed5125;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index e9e2ab7..cc7c724 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: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/12/12 08:55:23 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -47,7 +47,35 @@
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,InputText);
+
+
+
+
+  
+  //--------------------------------------------------------------------------
+  class InputTextWidget : wxPanel
+  {
+  public:
+    InputTextWidget(InputText* box, wxWindow *parent,
+		    wxString In, wxString title);
+    ~InputTextWidget();
+
+    std::string GetValue();
+    void OnTextUpdate(wxCommandEvent& event);
+
+    void SetTitle(wxString);
+
+  private:
+    InputText    *mBox;
+    wxTextCtrl	 *mwxTextCtrl;
+    wxStaticText *mwxTitle;
+  };
+  
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+
+  
   
   
   InputTextWidget::InputTextWidget(InputText* box,
@@ -118,7 +146,7 @@ namespace bbwx
   //--------------------------------------------------------------------------
   //--------------------------------------------------------------------------
 
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,InputText);
   BBTK_BLACK_BOX_IMPLEMENTATION(InputText,bbtk::WxBlackBox);
 
 
@@ -127,25 +155,30 @@ namespace bbwx
   { 
     bbSetInputTitle("");
     bbSetInputIn("");
+	  bbSetOutputWidget(0);
   }
   
 
   void InputText::Process() 
   { 
     InputTextWidget *w=(InputTextWidget *)bbGetOutputWidget();
-    bbSetInputIn( w->GetValue() );
-    bbSetOutputOut( w->GetValue() );
-    w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
+	if (w) 
+	{
+		bbSetInputIn( w->GetValue() );
+		w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
+	}
+	bbSetOutputOut( bbGetInputIn() );
   }
   
 
 
-  void InputText::CreateWidget()
+  void InputText::CreateWidget(wxWindow* parent)
   {
     bbSetOutputWidget
-      ( (wxWindow*) new InputTextWidget(this, bbGetWxParent(),
-					bbtk::std2wx ( bbGetInputIn() ) , 
-					bbtk::std2wx ( bbGetInputTitle() ) ) );
+      ( (wxWindow*) new InputTextWidget(this, //bbGetWxParent(),
+										parent,
+										bbtk::std2wx ( bbGetInputIn() ) , 
+										bbtk::std2wx ( bbGetInputTitle() ) ) );
 	
   }