Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

[wxWidgets.git] / include / wx / choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6110e4b35b60588ff6782103313c22d504a476b7..7ffaab5f148c5f441024402d0ed4e001cff3df5f 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "choicebase.h"
 #endif
 
     #pragma interface "choicebase.h"
 #endif
 


@@ -38,9 +38,7 @@ class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
     // all generic methods are in wxControlWithItems
 {
 public:
     // all generic methods are in wxControlWithItems

-#ifdef __DARWIN__
-    virtual ~wxChoiceBase() {}
-#endif
+    virtual ~wxChoiceBase();

 
     // single selection logic
     virtual void SetSelection(int n) = 0;
 
     // single selection logic
     virtual void SetSelection(int n) = 0;


@@ -56,7 +54,6 @@ public:
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
     // 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"
     #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(__WXPM__)
     #include "wx/os2/choice.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/choice.h"

 #endif
 
 #endif // wxUSE_CHOICE
 #endif
 
 #endif // wxUSE_CHOICE