From 14ca3a3b0ead6b9f521368d35ca34c87678544a8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 16 Nov 2010 22:38:38 +0000 Subject: [PATCH] Add more checks for wxUSE_DYNLIB_CLASS to wxMSW. Compilation fixes for wxApp and wxComboBox for wxUSE_DYNLIB_CLASS==0. See #12664. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/app.cpp | 16 ++++++++++++++++ src/msw/combobox.cpp | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 6f93301d0a..c69c55ffa4 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -297,6 +297,8 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() #ifndef __WXWINCE__ +#if wxUSE_DYNLIB_CLASS + #include namespace @@ -573,6 +575,20 @@ bool wxGUIAppTraits::WriteToStderr(const wxString& text) return s_consoleStderr.IsOkToUse() && s_consoleStderr.Write(text); } +#else // !wxUSE_DYNLIB_CLASS + +bool wxGUIAppTraits::CanUseStderr() +{ + return false; +} + +bool wxGUIAppTraits::WriteToStderr(const wxString& WXUNUSED(text)) +{ + return false; +} + +#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS + #endif // !__WXWINCE__ // =========================================================================== diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 98f3c867a1..f3f91a6563 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -438,6 +438,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg) WXHWND wxComboBox::GetEditHWNDIfAvailable() const { +#if wxUSE_DYNLIB_CLASS #if defined(WINVER) && WINVER >= 0x0500 typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*); static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL; @@ -455,7 +456,8 @@ WXHWND wxComboBox::GetEditHWNDIfAvailable() const (*s_pfnGetComboBoxInfo)(GetHwnd(), &info); return info.hwndItem; } -#endif +#endif // WINVER >= 0x0500 +#endif // wxUSE_DYNLIB_CLASS if (HasFlag(wxCB_SIMPLE)) { -- 2.45.2