fixing osx_carbon

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

diff --git a/src/common/rearrangectrl.cpp b/src/common/rearrangectrl.cpp
index 5f6bc2bf0680597fe9fada703f7732de135b881f..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


@@ -150,8 +150,8 @@ void wxRearrangeList::Swap(int pos1, int pos2)
 
         case wxClientData_Object:
             {
 
         case wxClientData_Object:
             {

-                wxClientData * const dataTmp = GetClientObject(pos1);
-                SetClientObject(pos1, GetClientObject(pos2));
+                wxClientData * const dataTmp = DetachClientObject(pos1);
+                SetClientObject(pos1, DetachClientObject(pos2));

                 SetClientObject(pos2, dataTmp);
             }
             break;
                 SetClientObject(pos2, dataTmp);
             }
             break;


@@ -285,8 +285,19 @@ bool wxRearrangeDialog::Create(wxWindow *parent,
     // notice that the items in this sizer should be inserted accordingly to
     // wxRearrangeDialogSizerPositions order
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
     // notice that the items in this sizer should be inserted accordingly to
     // wxRearrangeDialogSizerPositions order
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);

-    sizerTop->Add(new wxStaticText(this, wxID_ANY, message),
-                  wxSizerFlags().Border());
+
+    if ( !message.empty() )
+    {
+        sizerTop->Add(new wxStaticText(this, wxID_ANY, message),
+                      wxSizerFlags().Border());
+    }
+    else
+    {
+        // for convenience of other wxRearrangeDialog code that depends on
+        // positions of sizer items, insert a dummy zero-sized item
+        sizerTop->AddSpacer(0);
+    }
+

     sizerTop->Add(m_ctrl,
                   wxSizerFlags(1).Expand().Border());
     sizerTop->Add(CreateSeparatedButtonSizer(wxOK | wxCANCEL),
     sizerTop->Add(m_ctrl,
                   wxSizerFlags(1).Expand().Border());
     sizerTop->Add(CreateSeparatedButtonSizer(wxOK | wxCANCEL),