OS/2 fix

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

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index dddfa207b9421fc599d1aecaae1718f7edcdf66c..5cd390dfd4486561ae5e410eecc4928efae2c59e 100644 (file)
--- 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.
@@ -132,6 +132,16 @@
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_STACKWALKER 1
 
+// 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 +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
@@ -259,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
 // ----------------------------------------------------------------------------
@@ -1048,39 +1058,49 @@
 
 /* --- 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
 // ----------------------------------------------------------------------------
 
-// stuff which doesn't work/compile/make sense under Windows CE in alphabetical
-// order (please keep it!)
+// list of things which don't make sense under Windows CE in alphabetical order
+// (please keep it!)
 //
-// TODO: explain why each item is disabled and whether it can be enabled
+// NB: stuff which doesn't work at all under CE is forcefully disabled in
+//     wx/msw/wince/chkconf.h
 
 // wxCheckListBox requires wxOwnerDrawn which is disabled below
 #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
+#define wxUSE_DIALUP_MANAGER 0
+
+#undef wxUSE_DRAG_AND_DROP
+#define wxUSE_DRAG_AND_DROP 0
 
 #undef wxUSE_DYNAMIC_LOADER
 #define wxUSE_DYNAMIC_LOADER 0
 
-#undef wxUSE_FILECONFIG
-#define wxUSE_FILECONFIG 0
-
 #undef wxUSE_FSVOLUME
 #define wxUSE_FSVOLUME 0
 
-#undef wxUSE_MEDIACTRL
-#define wxUSE_MEDIACTRL 0
-
 // MDI is not supported under CE
 #undef wxUSE_MDI
 #define wxUSE_MDI 0
@@ -1104,15 +1124,14 @@
 #undef wxUSE_PRINTING_ARCHITECTURE
 #define wxUSE_PRINTING_ARCHITECTURE 0
 
-#ifdef __SMARTPHONE__
-    #undef wxUSE_STATUSBAR
-    #define wxUSE_STATUSBAR 0
-#endif
-
 // doesn't make much sense in absence of mouse...
 #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
 // ----------------------------------------------------------------------------