X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/990ff5ecebcdeaf78a44b043e070cfdfd0a3d70e..660296aa90ad5ecc98c585cc24567cee8130499a:/include/wx/univ/choice.h?ds=sidebyside diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 134192b4a3..7e7d852239 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_CHOICE_H_ #define _WX_UNIV_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univchoice.h" #endif @@ -34,6 +34,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 +49,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);