X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/926592a8cf4d74c4db610149b72172d0b263a5f4..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/univ/choice.h diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 0c98707ea0..27d3fbd022 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -12,15 +12,11 @@ #ifndef _WX_UNIV_CHOICE_H_ #define _WX_UNIV_CHOICE_H_ -#ifdef __GNUG__ - #pragma interface "univchoice.h" -#endif - #include "wx/combobox.h" // VS: This is only a *temporary* implementation, real wxChoice should not // derive from wxComboBox and may have different l&f -class WXDLLEXPORT wxChoice : public wxComboBox +class WXDLLIMPEXP_CORE wxChoice : public wxComboBox { public: wxChoice() {} @@ -34,16 +30,28 @@ 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, const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (wxString *) NULL, + int n = 0, const wxString choices[] = NULL, + 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); - - void *GetClientData(int n) const { return wxItemContainer::GetClientData(n); } private: void OnComboBox(wxCommandEvent &event);