X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a97d2db67e638e250c3d38ffa149d6a9feb681b..b5d43d1d73da3d4c690af39466fd1d73889df2db:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 95a7154bcb..d738e3e253 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -10,10 +10,13 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif +class WXDLLIMPEXP_BASE wxSortedArrayString; +class WXDLLIMPEXP_BASE wxArrayString; + //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- @@ -34,6 +37,18 @@ 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 ) + { + m_strings = (wxSortedArrayString *)NULL; + + Create(parent, id, pos, size, choices, style, validator, name); + } ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -42,6 +57,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 ); // implement base class pure virtuals void Delete(int n);