no real change; just add the standard separator where it's missing

[wxWidgets.git] / include / wx / osx / chkconf.h

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 755cc8c9859b32aacb16685faea3cd767d0d5001..b353b1c0343a0a90d87956708f9a16c60407f051 100644 (file)
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -49,10 +49,18 @@
  * using mixins of cocoa functionality
  */
  
  * using mixins of cocoa functionality
  */
  

-#ifndef wxOSX_USE_COCOA
+#ifdef __WXOSX_COCOA__
+    #define wxOSX_USE_COCOA 1
+#else

     #define wxOSX_USE_COCOA 0
 #endif
 
     #define wxOSX_USE_COCOA 0
 #endif
 

+#ifdef __WXOSX_CARBON__
+    #define wxOSX_USE_CARBON 1
+#else
+    #define wxOSX_USE_CARBON 0
+#endif
+

 /*
  * setting flags according to the platform
  */
 /*
  * setting flags according to the platform
  */


@@ -66,15 +74,9 @@
     #define wxOSX_USE_IPHONE 0
 #else
     #ifdef __WXOSX_IPHONE__
     #define wxOSX_USE_IPHONE 0
 #else
     #ifdef __WXOSX_IPHONE__

-        #define wxOSX_USE_CARBON 0

         #define wxOSX_USE_IPHONE 1
     #else
         #define wxOSX_USE_IPHONE 0
         #define wxOSX_USE_IPHONE 1
     #else
         #define wxOSX_USE_IPHONE 0

-        #if wxOSX_USE_COCOA
-            #define wxOSX_USE_CARBON 0
-        #else
-            #define wxOSX_USE_CARBON 1
-        #endif

     #endif
 #endif
 
     #endif
 #endif
 


@@ -102,4 +104,4 @@
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 

-#endif // _WX_OSX_CHKCONF_H_
\ No newline at end of file
+#endif // _WX_OSX_CHKCONF_H_