Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

many wxItemContainer-related changes:

Browse Source 
1. the main function for item insertion is now DoInsertItems() which allows
   for much more efficient addition of many new items at once
2. the items client data management is done entirely in wxItemContainer
   itself, the derived classes don't have to distinguish between void and
   object client data
3. many fixes for sorted controls, in particular implemented wxCB_SORT support
   in wxGTK combobox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-26 13:54:14 +00:00
parent 7f73c398d5
commit a236aa2058
98 changed files with 2825 additions and 2678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/univ/checklst.cpp
View File

@@ -146,46 +146,16 @@ void wxCheckListBox::Check(unsigned int item, bool check)
// methods forwarded to wxListBox
// ----------------------------------------------------------------------------
void wxCheckListBox::Delete(unsigned int n)
void wxCheckListBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n), _T("invalid index in wxListBox::Delete") );
wxListBox::Delete(n);
wxListBox::DoDeleteOneItem(n);
m_checks.RemoveAt(n);
}
int wxCheckListBox::DoAppend(const wxString& item)
void wxCheckListBox::OnItemInserted(unsigned int pos)
{
int pos = wxListBox::DoAppend(item);
// the item is initially unchecked
m_checks.Insert(false, pos);
return pos;
}
void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
{
wxListBox::DoInsertItems(items, pos);
unsigned int count = items.GetCount();
for ( unsigned int n = 0; n < count; n++ )
{
m_checks.Insert(false, pos + n);
}
}
void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
{
// call it first as it does DoClear()
wxListBox::DoSetItems(items, clientData);
unsigned int count = items.GetCount();
for ( unsigned int n = 0; n < count; n++ )
{
m_checks.Add(false);
}
}
void wxCheckListBox::DoClear()

32
src/univ/combobox.cpp
View File

@@ -344,13 +344,13 @@ void wxComboBox::SetEditable(bool editable)
// wxComboBox methods forwarded to wxListBox
// ----------------------------------------------------------------------------
void wxComboBox::Clear()
void wxComboBox::DoClear()
{
GetLBox()->Clear();
if ( GetTextCtrl() ) GetTextCtrl()->SetValue(wxEmptyString);
}
void wxComboBox::Delete(unsigned int n)
void wxComboBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n), _T("invalid index in wxComboBox::Delete") );
@@ -410,21 +410,11 @@ int wxComboBox::GetSelection() const
#endif
}
int wxComboBox::DoAppend(const wxString& item)
int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData, wxClientDataType type)
{
return GetLBox()->Append(item);
}
int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
{
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
if (pos == GetCount())
return DoAppend(item);
GetLBox()->Insert(item, pos);
return pos;
return GetLBox()->DoInsertItems(items, pos, clientData, type);
}
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
@@ -437,16 +427,6 @@ void *wxComboBox::DoGetItemClientData(unsigned int n) const
return GetLBox()->GetClientData(n);
}
void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
GetLBox()->SetClientObject(n, clientData);
}
wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
{
return GetLBox()->GetClientObject(n);
}
bool wxComboBox::IsEditable() const
{
return GetTextCtrl() != NULL && (!HasFlag(wxCB_READONLY) || GetTextCtrl()->IsEditable() );

126
src/univ/listbox.cpp
View File

@@ -192,7 +192,7 @@ bool wxListBox::Create(wxWindow *parent,
validator, name) )
return false;
m_strings = new wxArrayString;
m_strings = IsSorted() ? new wxArrayString : new wxSortedArrayString;
Set(n, choices);
@@ -217,67 +217,25 @@ wxListBox::~wxListBox()
// adding/inserting strings
// ----------------------------------------------------------------------------
int wxCMPFUNC_CONV wxListBoxSortNoCase(wxString* s1, wxString* s2)
int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData,
wxClientDataType type)
{
return s1->CmpNoCase(*s2);
}
int idx = wxNOT_FOUND;
int wxListBox::DoAppendOnly(const wxString& item)
{
unsigned int index;
if ( IsSorted() )
const unsigned int numItems = items.GetCount();
for ( unsigned int i = 0; i < numItems; ++i )
{
m_strings->Add(item);
m_strings->Sort(wxListBoxSortNoCase);
index = m_strings->Index(item);
}
else
{
index = m_strings->GetCount();
m_strings->Add(item);
}
const wxString& item = items[i];
idx = IsSorted() ? m_strings->Add(item)
: (m_strings->Insert(item, pos), pos++);
return index;
}
m_itemsClientData.Insert(NULL, idx);
AssignNewItemClientData(idx, clientData, i, type);
int wxListBox::DoAppend(const wxString& item)
{
size_t index = DoAppendOnly( item );
m_itemsClientData.Insert(NULL, index);
m_updateScrollbarY = true;
if ( HasHorzScrollbar() )
{
// has the max width increased?
wxCoord width;
GetTextExtent(item, &width, NULL);
if ( width > m_maxWidth )
{
m_maxWidth = width;
m_maxWidthItem = index;
m_updateScrollbarX = true;
}
}
RefreshFromItemToEnd(index);
return index;
}
void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
{
// the position of the item being added to a sorted listbox can't be
// specified
wxCHECK_RET( !IsSorted(), _T("can't insert items into sorted listbox") );
unsigned int count = items.GetCount();
for ( unsigned int n = 0; n < count; n++ )
{
m_strings->Insert(items[n], pos + n);
m_itemsClientData.Insert(NULL, pos + n);
// call the wxCheckListBox hook
OnItemInserted(idx);
}
// the number of items has changed so we might have to show the scrollbar
@@ -291,29 +249,8 @@ void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
// note that we have to refresh all the items after the ones we inserted,
// not just these items
RefreshFromItemToEnd(pos);
}
void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
{
DoClear();
unsigned int count = items.GetCount();
if ( !count )
return;
m_strings->Alloc(count);
m_itemsClientData.Alloc(count);
for ( unsigned int n = 0; n < count; n++ )
{
unsigned int index = DoAppendOnly(items[n]);
m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
}
m_updateScrollbarY = true;
RefreshAll();
return idx;
}
void wxListBox::SetString(unsigned int n, const wxString& s)
@@ -355,24 +292,10 @@ void wxListBox::DoClear()
{
m_strings->Clear();
if ( HasClientObjectData() )
{
unsigned int count = m_itemsClientData.GetCount();
for ( unsigned int n = 0; n < count; n++ )
{
delete (wxClientData *) m_itemsClientData[n];
}
}
m_itemsClientData.Clear();
m_selections.Clear();
m_current = -1;
}
void wxListBox::Clear()
{
DoClear();
m_updateScrollbarY = true;
@@ -381,7 +304,7 @@ void wxListBox::Clear()
RefreshAll();
}
void wxListBox::Delete(unsigned int n)
void wxListBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n),
_T("invalid index in wxListBox::Delete") );
@@ -392,11 +315,6 @@ void wxListBox::Delete(unsigned int n)
m_strings->RemoveAt(n);
if ( HasClientObjectData() )
{
delete (wxClientData *)m_itemsClientData[n];
}
m_itemsClientData.RemoveAt(n);
// when the item disappears we must not keep using its index
@@ -458,16 +376,6 @@ void *wxListBox::DoGetItemClientData(unsigned int n) const
return m_itemsClientData[n];
}
void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
m_itemsClientData[n] = clientData;
}
wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
{
return (wxClientData *)m_itemsClientData[n];
}
// ----------------------------------------------------------------------------
// selection
// ----------------------------------------------------------------------------