X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=da4870e0a8ee6a7fb3589faf36b40ee9eb726fd1;hb=46d7aa1e632342deddf3844a57c1460da9f20b13;hp=d64cfa54851d04b6ae32227c1331e9f24cbda3b4;hpb=3f088371dd1b2558e08da80141f2c0d6da0f1413;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index d64cfa5..da4870e 100644
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -58,7 +58,6 @@ namespace bbwx
 
     std::string GetValue();
 	void SetValue(std::string value);
-	void SetWindowStyle(int style);
 
     void OnTextEnter(wxCommandEvent& event);
     void OnTextUpdate(wxCommandEvent& event);
@@ -85,9 +84,9 @@ namespace bbwx
     wxPanel			*panel	= this;
 
 //wxTE_PROCESS_ENTER
-//wxTE_MULTILINE    For multiple line you have to create an other box (EED).
-
-    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(800,40) , 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)
@@ -106,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);
@@ -128,14 +127,6 @@ namespace bbwx
     mwxTitle->SetLabel(s);
   }
 
-   void InputTextWidget::SetWindowStyle(int style)
-  { 
-   	long wxstyle = wxTE_PROCESS_ENTER;
-	if (style==1) {wxstyle = wxTE_PASSWORD;}
-    mwxTextCtrl->SetWindowStyle(wxstyle);
-  }
-
-
   //-------------------------------------------------------------------------
   std::string InputTextWidget::GetValue()
   { 
@@ -183,9 +174,8 @@ namespace bbwx
 		firsttime=true;
 		bbSetInputTitle("");
 		bbSetInputIn("");
-		bbSetOutputWidget(0);
+		bbSetOutputWidget(NULL);
 		bbSetInputReactiveOnKeystroke(2);
-		bbSetInputStyle(0);
 	}
 	
 	//-----------------------------------------------------------------	
@@ -210,7 +200,6 @@ namespace bbwx
 			firsttime=false;
 			w->SetValue(  bbGetInputIn().c_str() );
 		}
-		w->SetWindowStyle( bbGetInputStyle() );
 		w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
 		bbSetOutputOut( w->GetValue() );
 	} else {