X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;fp=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=99c8a1939b637dcde83e7c8936727363bb7423e9;hb=bad0d72588d8007f18619212017ba87a0cfe944d;hp=48ba722ab09b015aeb4660c26ece0e2ef422f082;hpb=fbfe070fea8e317555e2b32138858b785ae79ec3;p=bbtk.git diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx index 48ba722..99c8a19 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: 2009/05/15 14:58:03 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/12/02 15:13:25 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -33,25 +33,16 @@ * \brief */ - #ifdef _USE_WXWIDGETS_ - #include "bbwxInputText.h" #include "bbwxPackage.h" //#include - - - namespace bbwx { - - - - - + //-------------------------------------------------------------------------- class InputTextWidget : wxPanel { @@ -75,9 +66,6 @@ namespace bbwx //------------------------------------------------------------------------ //------------------------------------------------------------------------ - - - InputTextWidget::InputTextWidget(InputText* box, wxWindow *parent, wxString In, @@ -89,28 +77,28 @@ namespace bbwx mwxTextCtrl = new wxTextCtrl( panel, -1, In, wxDefaultPosition, wxSize(800,20)); + 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 ); + mwxTitle = new wxStaticText(panel, -1, title ); + sizer-> Add( mwxTitle ); // } - sizer -> Add( mwxTextCtrl,1,wxGROW ); - sizer -> AddGrowableCol(0); + sizer-> Add( mwxTextCtrl, 1, wxGROW ); + sizer-> AddGrowableCol(0); - panel -> SetSizer(sizer); - panel -> SetAutoLayout(true); - panel -> Layout(); + panel-> SetSizer(sizer); + panel-> SetAutoLayout(true); + panel-> Layout(); } //------------------------------------------------------------------------- @@ -146,8 +134,8 @@ namespace bbwx //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- - BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,InputText); - BBTK_BLACK_BOX_IMPLEMENTATION(InputText,bbtk::WxBlackBox); + BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, InputText); + BBTK_BLACK_BOX_IMPLEMENTATION(InputText, bbtk::WxBlackBox); //----------------------------------------------------------------- @@ -187,15 +175,11 @@ namespace bbwx { bbSetOutputWidget ( (wxWindow*) new InputTextWidget(this, //bbGetWxParent(), - parent, - bbtk::std2wx ( bbGetInputIn() ) , - bbtk::std2wx ( bbGetInputTitle() ) ) ); - + parent, + bbtk::std2wx ( bbGetInputIn() ) , + bbtk::std2wx ( bbGetInputTitle() ) ) ); } - - - }//namespace bbtk #endif // _USE_WXWIDGETS_