applied patch 939076: __SMARTPHONE__ define

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 89dde316d2e059ad66aa72d37d0527df1be994c7..d4a19c9748309ee05740ff971f6aae2188677bd2 100644 (file)
--- a/include/wx/features.h
+++ b/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__)

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index e3a05aec7efab711d3305570f3e11e6c51366a16..6468dbb1ae0f837de42260d1381d5960466ae8ec 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index edd5317f2512310de30f987669e68f7bb0debee4..a836f82a02041fb8e08b4f055467b948f6a9b416 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7d172e745ac0f36f0ca9ad7e0390481fb74c4dd0..df1f9cdcc14c670db19abd95494f3021023047c5 100644 (file)
--- a/include/wx/platform.h
+++ b/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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 53667862aa2d8f10552e3a548bc87a264412595b..5f75393a5e90bb14beb3b15f8bbf324179fb50fb 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/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