]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix recreating of wxBitmapComboBox using untyped client data.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 24 Aug 2013 14:33:09 +0000 (14:33 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 24 Aug 2013 14:33:09 +0000 (14:33 +0000)
Use the correct array when restoring the client data, correcting a fatal typo
in the changes of r73880.

Closes #15436.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/bmpcbox.cpp

index 88d1cd6711f30a8522dc8146ee10988c26500819..f6d5950a02312914ba4ca4edbdd638863287b0e6 100644 (file)
@@ -175,7 +175,7 @@ void wxBitmapComboBox::RecreateControl()
         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