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

Fix VC6 compilation after r73880.

Browse Source 
Work around the broken scoping for the variables declared inside for loops in
this compiler by declaring the loop variable once for all loops.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-04-29 23:53:15 +00:00
parent 9e86876e69
commit 039d4cfb78
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/bmpcbox.cpp
View File

@@ -135,6 +135,7 @@ void wxBitmapComboBox::RecreateControl()
size.y = GetBestSize().y; size.y = GetBestSize().y;
const wxArrayString strings = GetStrings(); const wxArrayString strings = GetStrings();
const unsigned numItems = strings.size(); const unsigned numItems = strings.size();
unsigned i;
// Save the client data pointers before clearing the control, if any. // Save the client data pointers before clearing the control, if any.
const wxClientDataType clientDataType = GetClientDataType(); const wxClientDataType clientDataType = GetClientDataType();
@@ -147,14 +148,14 @@ void wxBitmapComboBox::RecreateControl()
case wxClientData_Object: case wxClientData_Object:
objectClientData.reserve(numItems); objectClientData.reserve(numItems);
for ( unsigned n = 0; n < numItems; ++n ) for ( i = 0; i < numItems; ++i )
objectClientData.push_back(GetClientObject(n)); objectClientData.push_back(GetClientObject(i));
break; break;
case wxClientData_Void: case wxClientData_Void:
voidClientData.reserve(numItems); voidClientData.reserve(numItems);
for ( unsigned n = 0; n < numItems; ++n ) for ( i = 0; i < numItems; ++i )
voidClientData.push_back(GetClientData(n)); voidClientData.push_back(GetClientData(i));
break; break;
} }
@@ -168,7 +169,7 @@ void wxBitmapComboBox::RecreateControl()
return; return;
// initialize the controls contents // initialize the controls contents
for ( unsigned int i = 0; i < numItems; i++ ) for ( i = 0; i < numItems; i++ )
{ {
wxComboBox::Append(strings[i]); wxComboBox::Append(strings[i]);