X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..563f85a9566128124df05eed60634a268dadf4c8:/include/wx/univ/choice.h?ds=sidebyside diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 7e7d852239..b598e8874f 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_ -#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() {} @@ -45,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); @@ -56,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) };