Make code reading BMP files more robust.

[wxWidgets.git] / src / common / rearrangectrl.cpp

diff --git a/src/common/rearrangectrl.cpp b/src/common/rearrangectrl.cpp
index c9a27121cb98bf9726e0b2f3cadfc69bf0dc8242..2e0ba1bcc6795b1b57d24c3541374bca3722f049 100644 (file)
--- a/src/common/rearrangectrl.cpp
+++ b/src/common/rearrangectrl.cpp
@@ -134,11 +134,11 @@ void wxRearrangeList::Swap(int pos1, int pos2)
     // first the label
     const wxString stringTmp = GetString(pos1);
     SetString(pos1, GetString(pos2));
     // first the label
     const wxString stringTmp = GetString(pos1);
     SetString(pos1, GetString(pos2));

-    Check(pos1, IsChecked(pos2));
+    SetString(pos2, stringTmp);

 
     // then the checked state
     const bool checkedTmp = IsChecked(pos1);
 
     // then the checked state
     const bool checkedTmp = IsChecked(pos1);

-    SetString(pos2, stringTmp);
+    Check(pos1, IsChecked(pos2));

     Check(pos2, checkedTmp);
 
     // and finally the client data, if necessary
     Check(pos2, checkedTmp);
 
     // and finally the client data, if necessary