Reversed the meaning of black and white in wxRegion::ConvertToBitmap

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6664996a0b9f94d20f887ab4f3b07ac749f45803..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
 


@@ -70,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