applied patch 939076: __SMARTPHONE__ define

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/features.h

@@ -29,14 +29,6 @@
     #undef wxHAS_RAW_KEY_CODES
 #endif
 
-/*  detect SmartPhone */
-#ifdef WIN32_PLATFORM_WFSP
-    #ifdef wxUSE_SMARTPHONE
-    #undef wxUSE_SMARTPHONE
-    #endif
-    #define wxUSE_SMARTPHONE 1
-#endif
-
 /*  taskbar is only implemented in wxMSW and X11 ports */
 #if defined(__WXMSW__) || \
         defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)

include/wx/msw/setup0.h

@@ -1070,9 +1070,6 @@
 // (notably, wxNotebook pages)
 #define wxUSE_UXTHEME_AUTO      1
 
-// Set to 1 to if you're developing for MS SmartPhone
-#define wxUSE_SMARTPHONE        0
-
 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------

include/wx/msw/wince/setup.h

@@ -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

include/wx/platform.h

@@ -117,6 +117,13 @@
 #    endif
 #endif /* WINE */
 
+/* detect SmartPhone */
+#if defined( WIN32_PLATFORM_WFSP )
+#    ifndef __SMARTPHONE__
+#        define __SMARTPHONE__
+#    endif
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options

src/common/cmndata.cpp

@@ -51,7 +51,7 @@
     #include <windowsx.h>
     #include "wx/msw/private.h"
 
-    #if defined(__WXWINCE__) && !wxUSE_SMARTPHONE
+    #ifndef __SMARTPHONE__
         #include <commdlg.h>
     #endif