From 654ffe9f190d79d1a79bc7433303e7953a2ca0b2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Aug 2006 22:17:08 +0000 Subject: [PATCH] compilation fix after wxPlatformInfo patch: use wxOS_WINDOWS_CE instead of wxWinPocketPC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dialogs/dialogs.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index bdb79dd3ee..9bedfdd490 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -1460,22 +1460,13 @@ SettingsDialog::SettingsDialog(wxWindow* win, int dialogType) m_imageList = NULL; Create(win, wxID_ANY, _("Preferences"), wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxWinCE, resizeBorder) -/* -#ifndef __WXWINCE__ - |resizeBorder -#endif -*/ + wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder) ); // If using a toolbook, also follow Mac style and don't create buttons if (!useToolBook) - CreateButtons(wxOK|wxCANCEL| (int)wxPlatform::IfNot(wxWinPocketPC, wxHELP) -/* -#ifndef __POCKETPC__ - |wxHELP -#endif -*/ + CreateButtons(wxOK | wxCANCEL | + (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, wxHELP) ); wxBookCtrlBase* notebook = GetBookCtrl(); -- 2.45.2