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 f0fcaa873d160acb933af606bfeb108b1bc2b9e1..6d5991fc9deeee3b70206e771f1660c8f3c1f104 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -47,13 +47,14 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
-// If migrating between versions, your dialogs may seem to shrink.
+// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
+// default system font is used for wxWindow::GetCharWidth/Height() instead of
+// the current font.
 //
-// Default is 1
+// Default is 0
 //
-// Recommended setting: 0 (the new calculations are more correct!)
-#define wxDIALOG_UNIT_COMPATIBILITY   1
+// Recommended setting: 0
+#define wxDIALOG_UNIT_COMPATIBILITY   0
 
 // ----------------------------------------------------------------------------
 // debugging settings
@@ -124,13 +125,23 @@
 #define wxUSE_ON_FATAL_EXCEPTION 1
 
 // Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidumop created by wxCrashReport::Generate()) stack back
+// machine-readable minidump created by wxCrashReport::Generate()) stack back
 // trace when your program crashes using wxStackWalker
 //
 // Default is 1 if supported by the compiler.
 //
 // Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
+#define wxUSE_STACKWALKER 0
+
+// Set this to 1 to compile in wxDebugReport class which allows you to create
+// and optionally upload to your web site a debug report consisting of back
+// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, it is compiled into a separate library so there
+//                         is no overhead if you don't use it
+#define wxUSE_DEBUGREPORT 1
 
 // ----------------------------------------------------------------------------
 // Unicode support
@@ -246,9 +257,6 @@
 //
 // Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
 // to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effectNotice that if
-// wxNO_THREADS is defined, wxUSE_THREADS is automatically reset to 0 in
-// wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
 // build/msw/config.* file this value will have no effect.
 //
 // Default is 1
@@ -259,9 +267,12 @@
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 
+// Enable conversion to  standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------
@@ -973,7 +984,7 @@
 #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.
@@ -1055,15 +1066,14 @@
 // 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
-    #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
@@ -1076,6 +1086,9 @@
 #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
@@ -1085,6 +1098,11 @@
 // 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_