leave i386 compiler to default

[wxWidgets.git] / src / msw / bmpcbox.cpp

diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index bdd42ed970804faf1e8323adea01b1feb9e217d4..f6d5950a02312914ba4ca4edbdd638863287b0e6 100644 (file)
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-04-06
-// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -135,6 +134,7 @@ void wxBitmapComboBox::RecreateControl()
     size.y = GetBestSize().y;
     const wxArrayString strings = GetStrings();
     const unsigned numItems = strings.size();
+    unsigned i;
 
     // Save the client data pointers before clearing the control, if any.
     const wxClientDataType clientDataType = GetClientDataType();
@@ -147,14 +147,14 @@ void wxBitmapComboBox::RecreateControl()
 
         case wxClientData_Object:
             objectClientData.reserve(numItems);
-            for ( unsigned n = 0; n < numItems; ++n )
-                objectClientData.push_back(GetClientObject(n));
+            for ( i = 0; i < numItems; ++i )
+                objectClientData.push_back(GetClientObject(i));
             break;
 
         case wxClientData_Void:
             voidClientData.reserve(numItems);
-            for ( unsigned n = 0; n < numItems; ++n )
-                voidClientData.push_back(GetClientData(n));
+            for ( i = 0; i < numItems; ++i )
+                voidClientData.push_back(GetClientData(i));
             break;
     }
 
@@ -168,14 +168,14 @@ void wxBitmapComboBox::RecreateControl()
         return;
 
     // initialize the controls contents
-    for ( unsigned int i = 0; i < numItems; i++ )
+    for ( i = 0; i < numItems; i++ )
     {
         wxComboBox::Append(strings[i]);
 
         if ( !objectClientData.empty() )
             SetClientObject(i, objectClientData[i]);
         else if ( !voidClientData.empty() )
-            SetClientData(i, objectClientData[i]);
+            SetClientData(i, voidClientData[i]);
     }
 
     // and make sure it has the same attributes as before