Remove duplicated typedef depending on header file version.

[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 79de00e12cf72a72a98a903d2f8057e05b6dc68a..a836f82a02041fb8e08b4f055467b948f6a9b416 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -146,9 +146,9 @@
 //
 // Default is 0
 //
-// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
+// Recommended setting: 1
 #ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1
 #endif
 
 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
@@ -246,7 +246,7 @@
 // Default is 1
 //
 // Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 0
+#define wxUSE_THREADS 1
 
 // If enabled (1), compiles wxWindows streams classes
 #define wxUSE_STREAMS       1
@@ -444,8 +444,8 @@
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
 
-// wxWave class
-#define wxUSE_WAVE      1
+// wxSound class
+#define wxUSE_SOUND      1
 
 // XML parsing classes. Note that their API will change in the future, so
 // using wxXmlDocument and wxXmlNode in your app is not recommended.
@@ -657,7 +657,7 @@
 #define wxUSE_DIB_FOR_BITMAP 0
 
 // Set this to 1 to enable wxDIB
-#define wxUSE_WXDIB 0
+#define wxUSE_WXDIB 1
 
 // ----------------------------------------------------------------------------
 // common dialogs
@@ -951,16 +951,16 @@
 #define wxUSE_IMAGE         1
 
 // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        0
+#define wxUSE_LIBPNG        1
 
 // Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       0
+#define wxUSE_LIBJPEG       1
 
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       0
 
 // Set to 1 for GIF format support
-#define wxUSE_GIF           0
+#define wxUSE_GIF           1
 
 // Set to 1 for PNM format support
 #define wxUSE_PNM           0
@@ -1061,8 +1061,26 @@
 // (notably, wxNotebook pages)
 #define wxUSE_UXTHEME_AUTO      0
 
-// Set to 1 to if you're developing for MS SmartPhone
-#define wxUSE_SMARTPHONE        0
+// Set to 1 if you want to maintain a PocketPC-style UI on
+// Windows CE .NET. If 0, wxWindows will use a commandbar
+// for the menubar, and a normal separate toolbar as per the
+// desktop implementation. If 1, wxWindows will combine
+// the toolbar and menubar as per the PocketPC implementation.
+//
+// Note that at present, the dynamic loading of PocketPC
+// shell functions on WinCE .NET is not yet done, and a
+// simple commandbar implementation is used instead of the
+// PocketPC one. The intention is to use the PocketPC style
+// when available (when wxUSE_POCKETPC_UI is 1).
+//
+// So if you're using WinCE .NET, and wxUSE_POCKETPC_UI is 0,
+// you will be able to create separate toolbars and menubars,
+// but _not_ the combined toolbar/menubar.
+
+// NOW OBSOLETE: we test WIN32_PLATFORM_PSPC and WIN32_PLATFORM_WFSP
+// instead
+
+// #define wxUSE_POCKETPC_UI       1
 
 // ----------------------------------------------------------------------------
 // obsolete settings