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

Add more checks for wxUSE_DYNLIB_CLASS to wxMSW.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2010-11-16 22:38:38 +00:00
parent c929ad9141
commit 14ca3a3b0e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/app.cpp
View File

@ -297,6 +297,8 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
#ifndef __WXWINCE__
#if wxUSE_DYNLIB_CLASS
#include <wx/dynlib.h>
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__
// ===========================================================================

4
src/msw/combobox.cpp
View File

@ -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))
{