From bad0d72588d8007f18619212017ba87a0cfe944d Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 2 Dec 2009 15:13:25 +0000 Subject: [PATCH] re-indent --- packages/wx/src/bbwxInputText.cxx | 50 +++++++++++-------------------- packages/wx/src/bbwxInputText.h | 15 ++++------ 2 files changed, 22 insertions(+), 43 deletions(-) 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_ diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h index af23565..8df43eb 100644 --- a/packages/wx/src/bbwxInputText.h +++ b/packages/wx/src/bbwxInputText.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxInputText.h,v $ Language: C++ - Date: $Date: 2009/05/15 14:58:03 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/12/02 15:13:25 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -28,7 +28,6 @@ * knowledge of the CeCILL-B license and that you accept its terms. * ------------------------------------------------------------------------ */ - /** * \brief Short description in one line * @@ -44,7 +43,6 @@ * \brief Pattern for the definition of a new type of Node */ - #ifdef _USE_WXWIDGETS_ @@ -57,8 +55,7 @@ namespace bbwx { - - + //================================================================= class bbwx_EXPORT InputText : public bbtk::WxBlackBox { @@ -76,8 +73,7 @@ namespace bbwx }; //================================================================= - - + //================================================================= // BlackBox description BBTK_BEGIN_DESCRIBE_BLACK_BOX(InputText,bbtk::WxBlackBox); @@ -91,10 +87,9 @@ namespace bbwx BBTK_OUTPUT(InputText,Out,"Current text",std::string,""); BBTK_END_DESCRIBE_BLACK_BOX(InputText); + //================================================================= - - } -- 2.47.1