X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62a879dfa0127253c7d095ed725a89465517bede..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index a8743fbb27..6664996a0b 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -20,6 +20,8 @@ #pragma interface "choicebase.h" #endif +#if wxUSE_CHOICE + #include "wx/ctrlsub.h" // the base class // ---------------------------------------------------------------------------- @@ -36,9 +38,7 @@ class WXDLLEXPORT wxChoiceBase : public wxControlWithItems { public: // all generic methods are in wxControlWithItems -#ifdef __WXMAC_X__ - virtual ~wxChoiceBase() {} -#endif + virtual ~wxChoiceBase(); // single selection logic virtual void SetSelection(int n) = 0; @@ -54,21 +54,20 @@ public: // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); - }; // ---------------------------------------------------------------------------- // include the platform-dependent class definition // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/choice.h" +#elif defined(__WXMSW__) #include "wx/msw/choice.h" #elif defined(__WXMOTIF__) #include "wx/motif/choice.h" #elif defined(__WXGTK__) #include "wx/gtk/choice.h" -#elif defined(__WXQT__) - #include "wx/qt/choice.h" #elif defined(__WXMAC__) #include "wx/mac/choice.h" #elif defined(__WXPM__) @@ -77,5 +76,7 @@ public: #include "wx/stubs/choice.h" #endif +#endif // wxUSE_CHOICE + #endif // _WX_CHOICE_H_BASE_