X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/926592a8cf4d74c4db610149b72172d0b263a5f4..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index 6110e4b35b..7ffaab5f14 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choicebase.h" #endif @@ -38,9 +38,7 @@ class WXDLLEXPORT wxChoiceBase : public wxControlWithItems { public: // all generic methods are in wxControlWithItems -#ifdef __DARWIN__ - virtual ~wxChoiceBase() {} -#endif + virtual ~wxChoiceBase(); // single selection logic virtual void SetSelection(int n) = 0; @@ -56,7 +54,6 @@ public: // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); - }; // ---------------------------------------------------------------------------- @@ -73,10 +70,10 @@ public: #include "wx/gtk/choice.h" #elif defined(__WXMAC__) #include "wx/mac/choice.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/choice.h" #elif defined(__WXPM__) #include "wx/os2/choice.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/choice.h" #endif #endif // wxUSE_CHOICE