Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the last remnants of Windows CE related code

Browse Source 
Remove the last few bits of code supporting Windows CE.
This commit is contained in:
PB
2019-05-18 08:40:03 +02:00
parent f668f5b36f
commit 357108d3cd
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/msvcrt.h
View File

@@ -22,8 +22,7 @@
// use debug CRT functions for memory leak detections in VC++ 5.0+ in debug // use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
// builds // builds
#undef wxUSE_VC_CRTDBG #undef wxUSE_VC_CRTDBG
#if defined(_DEBUG) && defined(__VISUALC__) \ #if defined(_DEBUG) && defined(__VISUALC__)
&& !defined(UNDER_CE)
// it doesn't combine well with wxWin own memory debugging methods // it doesn't combine well with wxWin own memory debugging methods
#if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__) #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
#define wxUSE_VC_CRTDBG #define wxUSE_VC_CRTDBG

7
samples/dialogs/dialogs.cpp
View File

@@ -3415,14 +3415,11 @@ SettingsDialog::SettingsDialog(wxWindow* win, SettingsData& settingsData, int di
m_imageList = NULL; m_imageList = NULL;
Create(win, wxID_ANY, "Preferences", wxDefaultPosition, wxDefaultSize, 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 using a toolbook, also follow Mac style and don't create buttons
if (!useToolBook) if (!useToolBook)
CreateButtons(wxOK | wxCANCEL | CreateButtons(wxOK | wxCANCEL | wxHELP);
(int)wxPlatform::IfNot(wxOS_WINDOWS_CE, wxHELP)
);
wxBookCtrlBase* notebook = GetBookCtrl(); wxBookCtrlBase* notebook = GetBookCtrl();
notebook->SetImageList(m_imageList); notebook->SetImageList(m_imageList);

6
src/richtext/richtextformatdlg.cpp
View File

@@ -120,13 +120,9 @@ bool wxRichTextFormattingDialog::Create(long flags, wxWindow* parent, const wxSt
SetWindowVariant(wxWINDOW_VARIANT_SMALL); SetWindowVariant(wxWINDOW_VARIANT_SMALL);
#endif #endif
int resizeBorder = wxRESIZE_BORDER;
GetFormattingDialogFactory()->SetSheetStyle(this); GetFormattingDialogFactory()->SetSheetStyle(this);
wxPropertySheetDialog::Create(parent, id, title, pos, sz, wxPropertySheetDialog::Create(parent, id, title, pos, sz, style | wxRESIZE_BORDER);
style | (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder)
);
GetFormattingDialogFactory()->CreateButtons(this); GetFormattingDialogFactory()->CreateButtons(this);
GetFormattingDialogFactory()->CreatePages(flags, this); GetFormattingDialogFactory()->CreatePages(flags, this);