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

Compilation fixes for VC6 after MSWGetComboBoxInfo() introduction.

Browse Source 
Don't use COMBOBOXINFO outside of WINVER checks, we can only use
tagCOMBOBOXINFO that we forward declared ourselves.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-18 00:14:37 +00:00
parent 0508392167
commit 1b6010d86f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/choice.cpp
View File

@@ -200,12 +200,12 @@ wxChoice::~wxChoice()
Clear(); Clear();
} }
bool wxChoice::MSWGetComboBoxInfo(COMBOBOXINFO* info) const bool wxChoice::MSWGetComboBoxInfo(tagCOMBOBOXINFO* info) const
{ {
// TODO-Win9x: Get rid of this once we officially drop support for Win9x // TODO-Win9x: Get rid of this once we officially drop support for Win9x
// and just call the function directly. // and just call the function directly.
#if wxUSE_DYNLIB_CLASS #if wxUSE_DYNLIB_CLASS
typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*); typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, tagCOMBOBOXINFO*);
static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL; static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL;
static bool s_triedToLoad = false; static bool s_triedToLoad = false;
if ( !s_triedToLoad ) if ( !s_triedToLoad )

4
src/msw/combobox.cpp
View File

@@ -377,9 +377,13 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
WXHWND wxComboBox::GetEditHWNDIfAvailable() const WXHWND wxComboBox::GetEditHWNDIfAvailable() const
{ {
// FIXME-VC6: Only VC6 needs this guard, see WINVER definition in
// include/wx/msw/wrapwin.h
#if defined(WINVER) && WINVER >= 0x0500
WinStruct<COMBOBOXINFO> info; WinStruct<COMBOBOXINFO> info;
if ( MSWGetComboBoxInfo(&info) ) if ( MSWGetComboBoxInfo(&info) )
return info.hwndItem; return info.hwndItem;
#endif // WINVER >= 0x0500
if (HasFlag(wxCB_SIMPLE)) if (HasFlag(wxCB_SIMPLE))
{ {