Files
wxWidgets/src/common/rearrangectrl.cpp
Vadim Zeitlin 2c737bfbc0 Revert change to m_order assignment in wxRearrangeList::Create()
This partially reverts 7e1b64a2eb as it
broke wxRearrangeList because assigning to m_order[n] used an
out-of-range index.

Another possible fix would be to replace reserve() call added in that
commit with resize(), but there doesn't seem to be any advantage in
assigning elements one by one, rather than all at once, as it had been
done before, so just revert this change instead.

See #17836.
2018-12-23 17:12:26 +01:00

397 lines
11 KiB
C++

///////////////////////////////////////////////////////////////////////////////
// Name: src/common/rearrangectrl.cpp
// Purpose: implementation of classes in wx/rearrangectrl.h
// Author: Vadim Zeitlin
// Created: 2008-12-15
// Copyright: (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_REARRANGECTRL
#ifndef WX_PRECOMP
#include "wx/button.h"
#include "wx/stattext.h"
#include "wx/sizer.h"
#endif // WX_PRECOMP
#include "wx/rearrangectrl.h"
// ============================================================================
// wxRearrangeList implementation
// ============================================================================
extern
WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeListNameStr[] = "wxRearrangeList";
wxBEGIN_EVENT_TABLE(wxRearrangeList, wxCheckListBox)
EVT_CHECKLISTBOX(wxID_ANY, wxRearrangeList::OnCheck)
wxEND_EVENT_TABLE()
bool wxRearrangeList::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayInt& order,
const wxArrayString& items,
long style,
const wxValidator& validator,
const wxString& name)
{
// construct the array of items in the order in which they should appear in
// the control
const size_t count = items.size();
wxCHECK_MSG( order.size() == count, false, "arrays not in sync" );
wxArrayString itemsInOrder;
itemsInOrder.reserve(count);
size_t n;
for ( n = 0; n < count; n++ )
{
int idx = order[n];
if ( idx < 0 )
idx = -idx - 1;
itemsInOrder.push_back(items[idx]);
}
// do create the real control
if ( !wxCheckListBox::Create(parent, id, pos, size, itemsInOrder,
style, validator, name) )
return false;
// and now check all the items which should be initially checked
for ( n = 0; n < count; n++ )
{
if ( order[n] >= 0 )
{
// Be careful to call the base class version here and not our own
// which would also update m_order itself.
wxCheckListBox::Check(n);
}
}
m_order = order;
return true;
}
bool wxRearrangeList::CanMoveCurrentUp() const
{
const int sel = GetSelection();
return sel != wxNOT_FOUND && sel != 0;
}
bool wxRearrangeList::CanMoveCurrentDown() const
{
const int sel = GetSelection();
return sel != wxNOT_FOUND && static_cast<unsigned>(sel) != GetCount() - 1;
}
bool wxRearrangeList::MoveCurrentUp()
{
const int sel = GetSelection();
if ( sel == wxNOT_FOUND || sel == 0 )
return false;
Swap(sel, sel - 1);
SetSelection(sel - 1);
return true;
}
bool wxRearrangeList::MoveCurrentDown()
{
const int sel = GetSelection();
if ( sel == wxNOT_FOUND || static_cast<unsigned>(sel) == GetCount() - 1 )
return false;
Swap(sel, sel + 1);
SetSelection(sel + 1);
return true;
}
void wxRearrangeList::Swap(int pos1, int pos2)
{
// update the internally stored order
wxSwap(m_order[pos1], m_order[pos2]);
// and now also swap all the attributes of the items
// first the label
const wxString stringTmp = GetString(pos1);
SetString(pos1, GetString(pos2));
SetString(pos2, stringTmp);
// then the checked state
const bool checkedTmp = IsChecked(pos1);
wxCheckListBox::Check(pos1, IsChecked(pos2));
wxCheckListBox::Check(pos2, checkedTmp);
// and finally the client data, if necessary
switch ( GetClientDataType() )
{
case wxClientData_None:
// nothing to do
break;
case wxClientData_Object:
{
wxClientData * const dataTmp = DetachClientObject(pos1);
SetClientObject(pos1, DetachClientObject(pos2));
SetClientObject(pos2, dataTmp);
}
break;
case wxClientData_Void:
{
void * const dataTmp = GetClientData(pos1);
SetClientData(pos1, GetClientData(pos2));
SetClientData(pos2, dataTmp);
}
break;
}
}
void wxRearrangeList::Check(unsigned int item, bool check)
{
if ( check == IsChecked(item) )
return;
wxCheckListBox::Check(item, check);
m_order[item] = ~m_order[item];
}
void wxRearrangeList::OnCheck(wxCommandEvent& event)
{
// update the internal state to match the new item state
const int n = event.GetInt();
if ( (m_order[n] >= 0) != IsChecked(n) )
m_order[n] = ~m_order[n];
}
int wxRearrangeList::DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos,
void **clientData, wxClientDataType type)
{
int ret = wxCheckListBox::DoInsertItems(items, pos, clientData, type);
const size_t numItems = items.GetCount();
for ( size_t i = 0; i < numItems; i++ )
{
// Item is not checked initially.
const int idx = ~m_order.size();
m_order.Insert(idx, pos+i);
}
return ret;
}
void wxRearrangeList::DoDeleteOneItem(unsigned int n)
{
wxCheckListBox::DoDeleteOneItem(n);
int idxDeleted = m_order[n];
if ( idxDeleted < 0 )
idxDeleted = ~idxDeleted;
m_order.RemoveAt(n);
// Remaining items have to be reindexed.
for( size_t i = 0; i < m_order.size(); i++ )
{
int idx = m_order[i];
if ( idx < 0 )
{
idx = ~idx;
if ( idx > idxDeleted )
m_order[i] = ~(idx-1);
}
else
{
if ( idx > idxDeleted )
m_order[i] = idx-1;
}
}
}
void wxRearrangeList::DoClear()
{
wxCheckListBox::DoClear();
m_order.Clear();
}
// ============================================================================
// wxRearrangeCtrl implementation
// ============================================================================
wxBEGIN_EVENT_TABLE(wxRearrangeCtrl, wxPanel)
EVT_UPDATE_UI(wxID_UP, wxRearrangeCtrl::OnUpdateButtonUI)
EVT_UPDATE_UI(wxID_DOWN, wxRearrangeCtrl::OnUpdateButtonUI)
EVT_BUTTON(wxID_UP, wxRearrangeCtrl::OnButton)
EVT_BUTTON(wxID_DOWN, wxRearrangeCtrl::OnButton)
wxEND_EVENT_TABLE()
void wxRearrangeCtrl::Init()
{
m_list = NULL;
}
bool
wxRearrangeCtrl::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayInt& order,
const wxArrayString& items,
long style,
const wxValidator& validator,
const wxString& name)
{
// create all the windows
if ( !wxPanel::Create(parent, id, pos, size, wxTAB_TRAVERSAL, name) )
return false;
m_list = new wxRearrangeList(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
order, items,
style, validator);
wxButton * const btnUp = new wxButton(this, wxID_UP);
wxButton * const btnDown = new wxButton(this, wxID_DOWN);
// arrange them in a sizer
wxSizer * const sizerBtns = new wxBoxSizer(wxVERTICAL);
sizerBtns->Add(btnUp, wxSizerFlags().Centre().Border(wxBOTTOM));
sizerBtns->Add(btnDown, wxSizerFlags().Centre().Border(wxTOP));
wxSizer * const sizerTop = new wxBoxSizer(wxHORIZONTAL);
sizerTop->Add(m_list, wxSizerFlags(1).Expand().Border(wxRIGHT));
sizerTop->Add(sizerBtns, wxSizerFlags(0).Centre().Border(wxLEFT));
SetSizer(sizerTop);
m_list->SetFocus();
return true;
}
void wxRearrangeCtrl::OnUpdateButtonUI(wxUpdateUIEvent& event)
{
event.Enable( event.GetId() == wxID_UP ? m_list->CanMoveCurrentUp()
: m_list->CanMoveCurrentDown() );
}
void wxRearrangeCtrl::OnButton(wxCommandEvent& event)
{
if ( event.GetId() == wxID_UP )
m_list->MoveCurrentUp();
else
m_list->MoveCurrentDown();
}
// ============================================================================
// wxRearrangeDialog implementation
// ============================================================================
extern
WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeDialogNameStr[] = "wxRearrangeDlg";
namespace
{
enum wxRearrangeDialogSizerPositions
{
Pos_Label,
Pos_Ctrl,
Pos_Buttons,
Pos_Max
};
} // anonymous namespace
bool wxRearrangeDialog::Create(wxWindow *parent,
const wxString& message,
const wxString& title,
const wxArrayInt& order,
const wxArrayString& items,
const wxPoint& pos,
const wxString& name)
{
if ( !wxDialog::Create(parent, wxID_ANY, title,
pos, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER,
name) )
return false;
m_ctrl = new wxRearrangeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
order, items);
// notice that the items in this sizer should be inserted accordingly to
// wxRearrangeDialogSizerPositions order
wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
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),
wxSizerFlags().Expand().Border());
SetSizerAndFit(sizerTop);
return true;
}
void wxRearrangeDialog::AddExtraControls(wxWindow *win)
{
wxSizer * const sizer = GetSizer();
wxCHECK_RET( sizer, "the dialog must be created first" );
wxASSERT_MSG( sizer->GetChildren().GetCount() == Pos_Max,
"calling AddExtraControls() twice?" );
sizer->Insert(Pos_Buttons, win, wxSizerFlags().Expand().Border());
win->MoveAfterInTabOrder(m_ctrl);
// we need to update the initial/minimal window size
sizer->SetSizeHints(this);
}
wxRearrangeList *wxRearrangeDialog::GetList() const
{
wxCHECK_MSG( m_ctrl, NULL, "the dialog must be created first" );
return m_ctrl->GetList();
}
wxArrayInt wxRearrangeDialog::GetOrder() const
{
wxCHECK_MSG( m_ctrl, wxArrayInt(), "the dialog must be created first" );
return m_ctrl->GetList()->GetCurrentOrder();
}
#endif // wxUSE_REARRANGECTRL