X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..721ab9053804ef63e42f33841e242753f1ed66aa:/include/wx/gtk1/control.h?ds=sidebyside diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index e7869e4f0e..085e5e8cfc 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -29,16 +29,26 @@ class wxControl; // wxControl //----------------------------------------------------------------------------- +extern const wxChar* wxControlNameStr; + class wxControl : public wxControlBase { public: wxControl(); - wxControl( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxPanelNameStr ); + wxControl(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr) + { + Create(parent, id, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr); // this function will filter out '&' characters and will put the accelerator // char (the one immediately after '&') into m_chAccel (TODO not yet) @@ -50,7 +60,7 @@ protected: wxString m_label; char m_chAccel; // enabled to avoid breaking binary compatibility later on - + private: DECLARE_DYNAMIC_CLASS(wxControl) };