diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index 38a4582e25..d79bdb3ac7 100644 --- a/include/wx/msw/msvcrt.h +++ b/include/wx/msw/msvcrt.h @@ -22,8 +22,7 @@ // use debug CRT functions for memory leak detections in VC++ 5.0+ in debug // builds #undef wxUSE_VC_CRTDBG -#if defined(_DEBUG) && defined(__VISUALC__) \ - && !defined(UNDER_CE) +#if defined(_DEBUG) && defined(__VISUALC__) // it doesn't combine well with wxWin own memory debugging methods #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__) #define wxUSE_VC_CRTDBG diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index be8887912e..7ccab36a73 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -3415,14 +3415,11 @@ SettingsDialog::SettingsDialog(wxWindow* win, SettingsData& settingsData, int di m_imageList = NULL; Create(win, wxID_ANY, "Preferences", wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder) - ); + wxDEFAULT_DIALOG_STYLE | resizeBorder); // If using a toolbook, also follow Mac style and don't create buttons if (!useToolBook) - CreateButtons(wxOK | wxCANCEL | - (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, wxHELP) - ); + CreateButtons(wxOK | wxCANCEL | wxHELP); wxBookCtrlBase* notebook = GetBookCtrl(); notebook->SetImageList(m_imageList); diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index 5fd0d7858d..4d61368a36 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -120,13 +120,9 @@ bool wxRichTextFormattingDialog::Create(long flags, wxWindow* parent, const wxSt SetWindowVariant(wxWINDOW_VARIANT_SMALL); #endif - int resizeBorder = wxRESIZE_BORDER; - GetFormattingDialogFactory()->SetSheetStyle(this); - wxPropertySheetDialog::Create(parent, id, title, pos, sz, - style | (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder) - ); + wxPropertySheetDialog::Create(parent, id, title, pos, sz, style | wxRESIZE_BORDER); GetFormattingDialogFactory()->CreateButtons(this); GetFormattingDialogFactory()->CreatePages(flags, this);