Partially applied patch [ 531199 ] new EVT_MOVING and EVT_SIZING

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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 23f662c3f9e65700557c460d1dbcbbfd394ed1af..f2bae0b7b7ea6a1db8a98d78004b114e4a461f24 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -579,6 +579,14 @@
 // Recommended setting: 1 (can be safely set to 0, not used by the library)
 #define wxUSE_CARET         1
 
+// Use wxDisplay class: it allows enumerating all displays on a system and
+// working with them.
+//
+// Default is 0 because it isn't yet implemented on all platforms
+//
+// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
+#define wxUSE_DISPLAY       0
+
 // Miscellaneous geometry code: needed for Canvas library
 #define wxUSE_GEOMETRY            1
 
@@ -975,7 +983,7 @@
 //
 // Recommended setting: 1, only set it to 0 if your compiler doesn't have
 //                      or can't compile <richedit.h>
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT  1
 
 // TODO:  This should be ifdef'ed for any compilers that don't support
@@ -1086,16 +1094,6 @@
 #define wxUSE_OWNER_DRAWN 0
 #endif // __SALFORDC__
 
-#ifdef __TWIN32__
-
-#undef wxUSE_THREADS
-#define wxUSE_THREADS 0
-
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-
-#endif // __TWIN32__
-
 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES