X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..b901ac2c3b618a020f87a4a02555b72c4b41bc21:/include/wx/univ/choice.h diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index a96d443d02..f56590f372 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_CHOICE_H_ #define _WX_UNIV_CHOICE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univchoice.h" -#endif - #include "wx/combobox.h" // VS: This is only a *temporary* implementation, real wxChoice should not @@ -34,6 +30,13 @@ public: { Create(parent, id, pos, size, n, choices, style, validator, name); } + wxChoice(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -42,6 +45,13 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr); private: void OnComboBox(wxCommandEvent &event);