wxMessageBox off the main thread lost result code.

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

diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index 2fbda6ebf0a482da2415ad7cccfd70a4314a8b8b..9789e77d54bb22709a82d4943e40f829b5196b23 100644 (file)
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Stefan Csomor
  * Modified by:
  * Created:     2008-07-30
  * Author:      Stefan Csomor
  * Modified by:
  * Created:     2008-07-30

- * RCS-ID:      $Id: chkconf.h 54833 2008-07-29 21:03:18Z SC $

  * Copyright:   (c) Stefan Csomor
  * Licence:     wxWindows licence
  */
  * Copyright:   (c) Stefan Csomor
  * Licence:     wxWindows licence
  */


@@ -12,6 +11,17 @@
 #ifndef _WX_OSX_COCOA_CHKCONF_H_
 #define _WX_OSX_COCOA_CHKCONF_H_
 
 #ifndef _WX_OSX_COCOA_CHKCONF_H_
 #define _WX_OSX_COCOA_CHKCONF_H_
 

+/* Many wchar functions (and also strnlen(), for some reason) are only
+   available since 10.7 so don't use them if we want to build the applications
+   that would run under 10.6 and earlier. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
+#define HAVE_STRNLEN 1
+#define HAVE_WCSDUP 1
+#define HAVE_WCSNLEN 1
+#define HAVE_WCSCASECMP 1
+#define HAVE_WCSNCASECMP 1
+#endif
+

 /*
  * native (1) or emulated (0) toolbar
  */
 /*
  * native (1) or emulated (0) toolbar
  */


@@ -20,8 +30,15 @@
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 

-/* 
- * text rendering system 
+/*
+ * leave is isFlipped and don't override
+ */
+#ifndef wxOSX_USE_NATIVE_FLIPPED 
+    #define wxOSX_USE_NATIVE_FLIPPED 1
+#endif
+
+/*
+ * text rendering system

  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5


@@ -41,29 +58,20 @@
 #endif
 
 /*
 #endif
 
 /*

- * turning off capabilities that don't work under cocoa yet
+ * Audio System

  */
 
  */
 

-#if wxUSE_DRAG_AND_DROP
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-
-#if wxUSE_TASKBARICON
-#undef wxUSE_TASKBARICON
-#define wxUSE_TASKBARICON 0
-#endif
-
-#if wxUSE_DATAVIEWCTRL
-#undef wxUSE_DATAVIEWCTRL
-#define wxUSE_DATAVIEWCTRL 0
-#endif
-
-#if wxUSE_WXHTML_HELP
-#undef wxUSE_WXHTML_HELP
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+    #define wxOSX_USE_QUICKTIME 0
+    #define wxOSX_USE_AUDIOTOOLBOX 1
+#else // platform < 10.5
+    #define wxOSX_USE_QUICKTIME 1
+    #define wxOSX_USE_AUDIOTOOLBOX 0

 #endif
 
 #endif
 

-#define wxUSE_WXHTML_HELP 0
+/*
+ * turning off capabilities that don't work under cocoa yet
+ */

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