* Renamed fstream.h in wfstream.h

[wxWidgets.git] / include / wx / msw / setup.h

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index ff69ed94c68088db1d8e72f28696105630323a22..ad0df4d2275ded156416e8b574550a63993b0b71 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -90,7 +90,7 @@
 
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
                                   // Use dynamic DIB loading/saving code in utils/dib under MSW.
-#define wxUSE_RESOURCE_LOADING_IN_MSW     0
+#define wxUSE_RESOURCE_LOADING_IN_MSW     1
                                   // Use dynamic icon/cursor loading/saving code
                                   // under MSW.
 #define wxUSE_WX_RESOURCES        1
@@ -116,13 +116,13 @@
                                   // NOW MANDATORY: don't change.
 #define wxUSE_MEMORY_TRACING      1
                                   // If 1, enables debugging versions of wxObject::new and
-                                  // wxObject::delete *IF* WXDEBUG is also defined.
+                                  // wxObject::delete *IF* __WXDEBUG__ is also defined.
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
 #define wxUSE_DEBUG_CONTEXT       1
                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 
-                                  // If WXDEBUG is not defined, will still use
+                                  // If __WXDEBUG__ is not defined, will still use
                                   // normal memory operators.
                                   // It's recommended to set this to 1,
                                   // since you may well need to output
@@ -132,6 +132,12 @@
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
+// GnuWin32 (b19) can't copy with these operators.
+#ifdef __GNUWIN32__
+#undef wxUSE_GLOBAL_MEMORY_OPERATORS 1
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#endif
+
 #define REMOVE_UNUSED_ARG 1
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
@@ -199,7 +205,7 @@
 #define wxUSE_PENWINDOWS 0
                                     // Set to 1 to use PenWindows
 
-#define wxUSE_OWNER_DRAWN             0
+#define wxUSE_OWNER_DRAWN             1
                                     // Owner-drawn menus and listboxes
 
 #define wxUSE_NATIVE_STATUSBAR        1