From d7da7f13eb27c6416b13aab8af4a7431a9ed1d67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 21 Apr 2004 21:13:49 +0000 Subject: [PATCH] applied patch 939076: __SMARTPHONE__ define git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/colordlg.cpp | 2 +- src/msw/filedlg.cpp | 2 +- src/msw/wince/filedlgwce.cpp | 2 +- src/msw/wince/tbarwce.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 467b05a3cd..53eed0cca9 100644 --- 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 b8d7c947e5..7888780761 100644 --- 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 cb6ed8ea46..bb0a24773b 100644 --- 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 6ef10da2e7..fe77c87875 100644 --- 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; -- 2.45.2