X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/univ/choice.h diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 3fff15eb4f..b598e8874f 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -12,37 +12,50 @@ #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 -// derive from wxComboBox and may have different l&f -class WXDLLEXPORT wxChoice : public wxComboBox +// derive from wxComboBox and may have different l&f +class WXDLLIMPEXP_CORE wxChoice : public wxComboBox { public: - wxChoice(); + wxChoice() {} wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = (const wxString *) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr) + { + 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); - + private: void OnComboBox(wxCommandEvent &event); - + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxChoice) };