Forgot to commit this one - changes for wxBase

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4c08a48dc651ec8295e0b21324f9d68dc359b253..fca3f3295b8a3d8934866705960fb010d53f3da1 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -428,6 +428,9 @@
  *
  */
 
+// Make settings compatible with MFC
+#define wxUSE_MFC           0
+
 #define wxUSE_OLE           1
                                 // drag-and-drop, clipboard, OLE Automation
 
@@ -468,7 +471,7 @@
                                 // Define 1 for font size to be backward compatible
                                 // to 1.63 and earlier. 1.64 and later define point
                                 // sizes to be compatible with Windows.
-#define wxUSE_GENERIC_DIALOGS_IN_MSW 1
+#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
                                 // Define 1 to use generic dialogs in Windows, even though
                                 // they duplicate native common dialog (e.g. wxColourDialog)
 #define wxUSE_PENWINDOWS 0
@@ -510,6 +513,19 @@
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif
 
+// MFC duplicates these operators
+#if wxUSE_MFC
+#undef  wxUSE_GLOBAL_MEMORY_OPERATORS
+#define wxUSE_GLOBAL_MEMORY_OPERATORS   0
+
+#undef  wxUSE_DEBUG_NEW_ALWAYS
+#define wxUSE_DEBUG_NEW_ALWAYS          0
+
+#ifndef _MBCS
+// #define _MBCS
+#endif
+#endif
+
 #if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs