AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add back WINVER check to fix VC6 compilation of wxMSW.

Browse Source 
The changes of r72953 removed the check for WINVER around the code using
COMBOBOXINFO but it's still needed with VC^, so restore it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-11-15 12:22:05 +00:00
parent 12fdbd3d6a
commit 7bc572ec82
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/choice.cpp
View File

@ -631,6 +631,9 @@ wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
// and its child part. I.e. arrow, separators, etc. // and its child part. I.e. arrow, separators, etc.
wxSize tsize(xlen, 0); wxSize tsize(xlen, 0);
// 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) )
{ {
@ -638,6 +641,7 @@ wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
+ info.rcItem.left + 3; // right and extra margins + info.rcItem.left + 3; // right and extra margins
} }
else // Just use some rough approximation. else // Just use some rough approximation.
#endif // WINVER >= 0x0500
{ {
tsize.x += 4*cHeight; tsize.x += 4*cHeight;
} }