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 a5cd466b5144200c506fc5987193be5951f57823..a836f82a02041fb8e08b4f055467b948f6a9b416 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -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,9 +1061,6 @@
 // (notably, wxNotebook pages)
 #define wxUSE_UXTHEME_AUTO      0
 
-// Set to 1 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
@@ -1079,7 +1076,11 @@
 // 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.
-#define wxUSE_POCKETPC_UI       1
+
+// NOW OBSOLETE: we test WIN32_PLATFORM_PSPC and WIN32_PLATFORM_WFSP
+// instead
+
+// #define wxUSE_POCKETPC_UI       1
 
 // ----------------------------------------------------------------------------
 // obsolete settings