Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

[wxWidgets.git] / include / wx / mac / setup0.h

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 179122ea6dfd41ff49a98de7a8e38fc116be8608..6d5991fc9deeee3b70206e771f1660c8f3c1f104 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -270,7 +270,7 @@
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 

-// Enable converion to  standard C++ string if 1.
+// Enable conversion to  standard C++ string if 1.

 #define wxUSE_STD_STRING  0
 
 // ----------------------------------------------------------------------------
 #define wxUSE_STD_STRING  0
 
 // ----------------------------------------------------------------------------


@@ -984,7 +984,7 @@
 #define wxODBC_FWD_ONLY_CURSORS         1
 
 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
 #define wxODBC_FWD_ONLY_CURSORS         1
 
 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,

-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the

 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.


@@ -1066,15 +1066,14 @@
 // override some settings for Metrowerks
 //
 // VZ: isn't this file only used when building with Metrowerks anyhow?
 // override some settings for Metrowerks
 //
 // VZ: isn't this file only used when building with Metrowerks anyhow?

+// CS: no, it is also used by the XCode projects 

 #ifdef __MWERKS__
     #undef wxUSE_DEBUG_CONTEXT
     #define wxUSE_DEBUG_CONTEXT 1
 
     #undef wxUSE_STD_IOSTREAM
 #ifdef __MWERKS__
     #undef wxUSE_DEBUG_CONTEXT
     #define wxUSE_DEBUG_CONTEXT 1
 
     #undef wxUSE_STD_IOSTREAM

-    #define wxUSE_STD_IOSTREAM  1
-
-    #undef wxUSE_STACKWALKER
-    #define wxUSE_STACKWALKER 0
+    // CS: I have to set this to 0 now, as shared builds are having problems 
+    #define wxUSE_STD_IOSTREAM  0

 #endif
 
 // things not implemented under Mac
 #endif
 
 // things not implemented under Mac


@@ -1087,6 +1086,9 @@
 #undef wxUSE_TOGGLEBTN
 #define wxUSE_TOGGLEBTN 0
 
 #undef wxUSE_TOGGLEBTN
 #define wxUSE_TOGGLEBTN 0
 

+#undef wxUSE_STACKWALKER
+#define wxUSE_STACKWALKER 0
+

 // wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to
 // embed the Safari browser control
 // 0 by default because of Jaguar compatibility problems
 // wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to
 // embed the Safari browser control
 // 0 by default because of Jaguar compatibility problems


@@ -1096,6 +1098,11 @@
 // Set to 0 for no libmspack
 #define wxUSE_LIBMSPACK     0
 
 // Set to 0 for no libmspack
 #define wxUSE_LIBMSPACK     0
 

+// native toolbar does not support embedding controls yet, please test by setting to 1
+#define wxMAC_USE_NATIVE_TOOLBAR 0
+
+
+

 
 #endif
     // _WX_SETUP_H_
 
 #endif
     // _WX_SETUP_H_