X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..dca0afc73cbd2a278f9d48bf75ef381b11b5aa00:/include/wx/univ/choice.h?ds=sidebyside diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 3c28c5f4bd..b598e8874f 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -15,7 +15,7 @@ #include "wx/combobox.h" // VS: This is only a *temporary* implementation, real wxChoice should not -// derive from wxComboBox and may have different l&f +// derive from wxComboBox and may have different l&f class WXDLLIMPEXP_CORE wxChoice : public wxComboBox { public: @@ -41,7 +41,7 @@ public: 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); @@ -52,10 +52,10 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - + private: void OnComboBox(wxCommandEvent &event); - + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxChoice) };