X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1777b9bbf4573dabecf4a3256d0d3c2c0c2a3fdf..f17fee68eac048a593e83f3a74d8a74f6a7ddacb:/include/wx/control.h?ds=sidebyside diff --git a/include/wx/control.h b/include/wx/control.h index c68cfa4e84..6f5999c7bc 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma interface "choicebase.h" + #pragma interface "controlbase.h" #endif #include "wx/window.h" // base class @@ -34,16 +34,30 @@ public: virtual void Command(wxCommandEvent &event); protected: - // creates the controls (invokes wxWindowBase::CreateBase) and adds it to - // the list of parents children + // creates the control (calls wxWindowBase::CreateBase inside) and adds it + // to the list of parents children bool CreateControl(wxWindowBase *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, +#if wxUSE_VALIDATORS const wxValidator& validator, +#endif const wxString& name); + // an overloaded version for the controls without validators + bool CreateControl(wxWindowBase *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) + { + return CreateControl(parent, id, pos, size, style, + wxDefaultValidator, name); + } + // inherit colour and font settings from the parent window void InheritAttributes(); };