applied patch 939076: __SMARTPHONE__ define

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 467b05a3cde72232cdbfdeb7614d068a6dc57030..53eed0cca9242074b0697bf5dedb1cf531bafc95 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -42,7 +42,7 @@
     #include "wx/msgdlg.h"
 #endif
 
-#if wxUSE_COLOURDLG && !wxUSE_SMARTPHONE
+#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
 
 #include "wx/msw/private.h"
 #include "wx/colordlg.h"

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index b8d7c947e5045230502f715327514157b11a8195..7888780761afc82e5f6c1c41d94e2fcf45c38c7b 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_FILEDLG && !wxUSE_SMARTPHONE
+#if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index cb6ed8ea46416a1750783e2d30d3710c16bd24a2..bb0a24773b6004943f198c90c2c639d8750dd436 100644 (file)
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -31,7 +31,7 @@
 // Only use this for MS SmartPhone. Use standard file dialog
 // for Pocket PC.
 
-#if wxUSE_FILEDLG && wxUSE_SMARTPHONE
+#if wxUSE_FILEDLG && defined(__SMARTPHONE__)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 6ef10da2e7d4f619f1b50f76dd3aeac6f85f4a8f..fe77c878756fff03594bce9ca7967969791e8e72 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -256,7 +256,7 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
     memset (&mbi, 0, sizeof (SHMENUBARINFO));
     mbi.cbSize     = sizeof (SHMENUBARINFO);
     mbi.hwndParent = (HWND) GetParent()->GetHWND();
-#if defined(WIN32_PLATFORM_WFSP)
+#ifdef __SMARTPHONE__
     mbi.nToolBarId = 5002;
 #else
     mbi.nToolBarId = 5000;