X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.h;h=af235652fc88aa30c2e0ff6a54dcef33345ac20e;hb=313f228ef0ea749e2b83220eacc19b114961d20c;hp=f71adf17a4147dde30e5f095ba0228cb7c0fe74a;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h index f71adf1..af23565 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: 2008/10/17 08:18:32 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -53,44 +53,14 @@ #include "bbtkWxBlackBox.h" - +#include "bbwx_EXPORT.h" namespace bbwx { - - - class 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; - }; - - //------------------------------------------------------------------------ - //------------------------------------------------------------------------ - //------------------------------------------------------------------------ - - - - - - class /*BBTK_EXPORT*/ InputText : public bbtk::WxBlackBox + //================================================================= + class bbwx_EXPORT InputText : public bbtk::WxBlackBox { BBTK_BLACK_BOX_INTERFACE(InputText,bbtk::WxBlackBox); @@ -100,15 +70,16 @@ namespace bbwx BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); protected: - virtual void bbUserConstructor(); + }; + //================================================================= //================================================================= - // UserBlackBox description + // BlackBox description BBTK_BEGIN_DESCRIBE_BLACK_BOX(InputText,bbtk::WxBlackBox); BBTK_NAME("InputText"); BBTK_AUTHOR("laurent guigues at creatis.insa-lyon.fr"); @@ -131,4 +102,4 @@ namespace bbwx //namespace bbtk #endif //__bbWxInputText_h__ -#endif //_USE_WXWIDGETS_ +#endif //USE_WXWIDGETS