use GtkComboBox instead of deprecated GtkOptionMenu for wxChoice; this also allows...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7750a3af7819196a137fb3bf3b6130e744999a5d..8f6545c3f419977af3d84339806b6d663ddd9530 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -68,14 +68,14 @@
     using OS X libraries like Carbon or CoreServices.
 
  */
     using OS X libraries like Carbon or CoreServices.
 
  */

-#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXASPEN__)

 #   define __WXOSX__
 #endif
 
 #ifdef __WXOSX__
 #    ifdef __WXMAC_XCODE__
 #        include <unistd.h>
 #   define __WXOSX__
 #endif
 
 #ifdef __WXOSX__
 #    ifdef __WXMAC_XCODE__
 #        include <unistd.h>

-#        include "wx/mac/carbon/config_xcode.h"
+#        include "wx/mac/config_xcode.h"

 #    endif
 #endif
 /*
 #    endif
 #endif
 /*


@@ -211,7 +211,15 @@
    Note that it must be included before defining hardware symbols below as they
    could be already defined by configure
  */
    Note that it must be included before defining hardware symbols below as they
    could be already defined by configure
  */

-#include "wx/setup.h"
+#ifdef __GCCXML__
+    /*
+        we're using gccxml to create an XML representation of the entire
+        wxWidgets interface; pass it a special setup.h file
+    */
+    #include "wx/setup_gccxml.h"
+#else
+    #include "wx/setup.h"
+#endif

 
 /*
    Hardware platform detection.
 
 /*
    Hardware platform detection.


@@ -277,7 +285,7 @@
 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo
 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo

-   explorer, available for free at http://www.turboexplorer.com/downloads 
+   explorer, available for free at http://www.turboexplorer.com/downloads

 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
 #   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."
 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
 #   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."


@@ -609,6 +617,9 @@
 #        define wxHAVE_RAW_BITMAP
 #    endif
 #endif
 #        define wxHAVE_RAW_BITMAP
 #    endif
 #endif

+#if defined(__WXGTK20__) || defined(__WXMAC__)
+#    define wxHAVE_RAW_BITMAP
+#endif

 
 /*
     Handle Darwin gcc universal compilation.  Don't do this in an Apple-
 
 /*
     Handle Darwin gcc universal compilation.  Don't do this in an Apple-