Minimal tweaks and additions to get wxSTC compiling successfully again, with Scintill...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 50476b9e5f2b716ee4337d7b477533dd08417435..7057c77b54685a9cbbe3ae0c5fe39fef583c7133 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -153,15 +153,6 @@
  */
 #include "wx/setup.h"
 
-#ifdef __GCCXML__
-    /*
-        we're using gccxml to create an XML representation of the entire
-        wxWidgets interface; use a special setup_gccxml.h file to fix some
-        of the stuff #defined by the real setup.h
-    */
-    #include "wx/setup_gccxml.h"
-#endif
-
 /*
    Convenience for any optional classes that use the wxAnyButton base class.
  */
@@ -618,8 +609,7 @@
     checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
     for it.
  */
-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
-        || (defined(__DARWIN__) && !wxUSE_GUI)
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
 #   ifndef __WXOSX__
 #       define __WXOSX__ 1
 #   endif