X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04165bec2cdc510a84f794fe69ebfe4a802e2ee1..af01f1ba0d697c07173f436ab661b4c833258a91:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 2a5227180e..7dfa143621 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -29,8 +29,6 @@ class wxControl; // wxControl //----------------------------------------------------------------------------- -extern const wxChar* wxControlNameStr; - class wxControl : public wxControlBase { public: @@ -38,24 +36,16 @@ public: wxControl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxControlNameStr) { - Create(parent, id, pos, size, style, -#if wxUSE_VALIDATORS - validator, -#endif - name); + 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, -#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxControlNameStr); // this function will filter out '&' characters and will put the accelerator