Commented out wxAutoNSAutoreleasePool in CallOnInit()

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6664996a0b9f94d20f887ab4f3b07ac749f45803..9decf2b7852a239780ae9bb6cf9058c87f8d6034 100644 (file)
--- 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
 
@@ -47,7 +47,7 @@ public:
     // don't override this
     virtual void Select(int n) { SetSelection(n); }
 
-    // set/get the number of columns in the control (as they're not supporte on
+    // set/get the number of columns in the control (as they're not supported on
     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
     virtual int GetColumns() const { return 1 ; }
@@ -70,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