X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36b6448cc3b65c0167ad2100003aaec2ad429d3c..f23b6f74bbf43799594924e94382b13587b4a57e:/include/wx/msw/wince/setup.h

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 4bc5654394..5cd390dfd4 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -124,7 +124,7 @@
 #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.
@@ -138,8 +138,8 @@
 //
 // Default is 1 if supported by the compiler.
 //
-// Recommended setting: 1 under Win32, it is not especially useful elsewhere
-//                      currently
+// 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
 
 // ----------------------------------------------------------------------------
@@ -256,9 +256,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
@@ -269,9 +266,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 converion to  standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------
@@ -1058,6 +1058,22 @@
 
 /* --- end common options --- */
 
+// ----------------------------------------------------------------------------
+// general Windows-specific stuff
+// ----------------------------------------------------------------------------
+
+// Set this to 1 for generic OLE support: this is required for drag-and-drop,
+// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
+// can't compile/doesn't have the OLE headers.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_OLE           1
+
+// Set this to 1 to enable wxDIB (don't change unless you have reason to)
+#define wxUSE_WXDIB 1
+
 // ----------------------------------------------------------------------------
 // Windows CE specific stuff
 // ----------------------------------------------------------------------------
@@ -1072,10 +1088,6 @@
 #undef wxUSE_CHECKLISTBOX
 #define wxUSE_CHECKLISTBOX 0
 
-// ???
-#undef wxUSE_COMMON_DIALOGS
-#define wxUSE_COMMON_DIALOGS 0
-
 // Windows CE doesn't use RAS so wxDialUpManager doesn't work under it
 #undef wxUSE_DIALUP_MANAGER
 #define wxUSE_DIALUP_MANAGER 0
@@ -1086,9 +1098,6 @@
 #undef wxUSE_DYNAMIC_LOADER
 #define wxUSE_DYNAMIC_LOADER 0
 
-#undef wxUSE_FILECONFIG
-#define wxUSE_FILECONFIG 0
-
 #undef wxUSE_FSVOLUME
 #define wxUSE_FSVOLUME 0
 
@@ -1119,6 +1128,10 @@
 #undef wxUSE_TOOLTIPS
 #define wxUSE_TOOLTIPS 0
 
+// Do use commdlg.h
+#undef wxUSE_COMMON_DIALOGS
+#define wxUSE_COMMON_DIALOGS 1
+
 // ----------------------------------------------------------------------------
 // MSW settings not supported by CE
 // ----------------------------------------------------------------------------