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

70
src/generic/htmllbox.cpp
View File

@@ -562,19 +562,19 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
for (int i=0; i<n; i++)
Append(choices[i]);
Append(n, choices);
return true;
}
bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString& name)
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString& name)
{
if (!wxHtmlListBox::Create(parent, id, pos, size, style, name))
return false;
@@ -582,6 +582,7 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
Append(choices);
return true;
@@ -589,53 +590,46 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
wxSimpleHtmlListBox::~wxSimpleHtmlListBox()
{
wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount());
if (HasClientObjectData())
{
// clear the array of client data objects
for (size_t i=0; i<m_items.GetCount(); i++)
delete DoGetItemClientObject(i);
}
m_items.Clear();
m_HTMLclientData.Clear();
wxItemContainer::Clear();
}
void wxSimpleHtmlListBox::Clear()
void wxSimpleHtmlListBox::DoClear()
{
wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount());
m_items.Clear();
m_HTMLclientData.Clear();
UpdateCount();
}
void wxSimpleHtmlListBox::Delete(unsigned int n)
void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n)
{
m_items.RemoveAt(n);
m_HTMLclientData.RemoveAt(n);
UpdateCount();
}
void wxSimpleHtmlListBox::Append(const wxArrayString& strings)
int wxSimpleHtmlListBox::DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData,
wxClientDataType type)
{
// append all given items at once
WX_APPEND_ARRAY(m_items, strings);
m_HTMLclientData.Add(NULL, strings.GetCount());
UpdateCount();
}
const unsigned int count = items.GetCount();
int wxSimpleHtmlListBox::DoAppend(const wxString& item)
{
m_items.Add(item);
m_HTMLclientData.Add(NULL);
UpdateCount();
return GetCount()-1;
}
m_items.Insert(wxEmptyString, pos, count);
m_HTMLclientData.Insert(NULL, pos, count);
for ( unsigned int i = 0; i < count; ++i, ++pos )
{
m_items[pos] = items[i];
AssignNewItemClientData(pos, clientData, i, type);
}
int wxSimpleHtmlListBox::DoInsert(const wxString& item, unsigned int pos)
{
m_items.Insert(item, pos);
m_HTMLclientData.Insert(NULL, pos);
UpdateCount();
return pos;
}
@@ -644,7 +638,7 @@ void wxSimpleHtmlListBox::SetString(unsigned int n, const wxString& s)
wxCHECK_RET( IsValid(n),
wxT("invalid index in wxSimpleHtmlListBox::SetString") );
m_items[n]=s;
m_items[n]=s;
RefreshRow(n);
}