X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=50fd6a844af908ef4a11994d8bda02998ec300e5;hb=103f8756e4e48f909eb4f6db115043d5b08c6f1d;hp=3056f05f3abba7b24c9eb6071a1d81c139f83241;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index 3056f05..50fd6a8 100644
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -53,7 +53,7 @@ namespace bbwx
   {
   public:
     InputTextWidget(InputText* box, wxWindow *parent,
-		    wxString In, wxString title);
+		    wxString In, wxString title );
     ~InputTextWidget();
 
     std::string GetValue();
@@ -77,13 +77,16 @@ namespace bbwx
   InputTextWidget::InputTextWidget(InputText* box,
 				   wxWindow *parent, 
 				   wxString In, 
-				   wxString title)
+				   wxString title )
     : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
       mBox(box)
   {
     wxPanel			*panel	= this;
-    
-    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(800,20),wxTE_PROCESS_ENTER);
+
+//wxTE_PROCESS_ENTER
+//wxTE_MULTILINE    
+//wxTE_PASSWORD
+    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(80,80) , wxTE_PROCESS_ENTER);
     Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER, 
 	     (wxObjectEventFunction) 
 	     (wxEventFunction)
@@ -102,7 +105,7 @@ namespace bbwx
     wxFlexGridSizer *sizer	= new wxFlexGridSizer(1);
     mwxTitle = new wxStaticText(panel, -1, title ); 
     sizer-> Add( mwxTitle ); 
-    sizer-> Add( mwxTextCtrl, 1, wxGROW ); 
+    sizer-> Add( mwxTextCtrl, 1, wxEXPAND ); 
     sizer-> AddGrowableCol(0);
     
     panel-> SetSizer(sizer);
@@ -171,7 +174,7 @@ namespace bbwx
 		firsttime=true;
 		bbSetInputTitle("");
 		bbSetInputIn("");
-		bbSetOutputWidget(0);
+		bbSetOutputWidget(NULL);
 		bbSetInputReactiveOnKeystroke(2);
 	}
 	
@@ -200,7 +203,7 @@ namespace bbwx
 		w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
 		bbSetOutputOut( w->GetValue() );
 	} else {
-	  bbSetOutputOut( "<VOID>" );
+	  bbSetOutputOut( bbGetInputIn().c_str() );
 	}
   }
   
@@ -209,10 +212,12 @@ namespace bbwx
   void InputText::CreateWidget(wxWindow* parent)
   {
     bbSetOutputWidget
-      ( (wxWindow*) new InputTextWidget(this, //bbGetWxParent(),
-					parent,
-					bbtk::std2wx ( bbGetInputIn() ) , 
-					bbtk::std2wx ( bbGetInputTitle() ) ) );	
+     ( (wxWindow*) new InputTextWidget(	this, //bbGetWxParent(),
+										parent,
+										bbtk::std2wx ( bbGetInputIn() ) , 
+										bbtk::std2wx ( bbGetInputTitle() ) 
+									  ) 
+	 );	
   }
 
 }//namespace bbtk