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

189
src/gtk/choice.cpp
View File

@@ -103,9 +103,9 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
m_widget = gtk_option_menu_new();
if ( style & wxCB_SORT )
if ( IsSorted() )
{
// if our m_strings != NULL, DoAppend() will check for it and insert
// if our m_strings != NULL, Append() will check for it and insert
// items in the correct order
m_strings = new wxSortedArrayString;
}
@@ -137,79 +137,46 @@ wxChoice::~wxChoice()
delete m_strings;
}
int wxChoice::DoAppend( const wxString &item )
int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData, wxClientDataType type)
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
return GtkAddHelper(menu, GetCount(), item);
}
int wxChoice::DoInsert(const wxString &item, unsigned int pos)
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));
if (pos == GetCount())
return DoAppend(item);
const unsigned int count = items.GetCount();
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
for ( unsigned int i = 0; i < count; ++i, ++pos )
{
int n = GtkAddHelper(menu, pos, items[i]);
if ( n == wxNOT_FOUND )
return n;
AssignNewItemClientData(n, clientData, i, type);
}
// if the item to insert is at or before the selection, and the selection is valid
if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
{
// move the selection forward one
m_selection_hack++;
// move the selection forward
m_selection_hack += count;
}
return GtkAddHelper(menu, pos, item);
return pos - 1;
}
void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
wxList::compatibility_iterator node = m_clientList.Item( n );
wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
node->SetData( (wxObject*) clientData );
m_clientData[n] = clientData;
}
void* wxChoice::DoGetItemClientData(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
wxList::compatibility_iterator node = m_clientList.Item( n );
wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
return node->GetData();
return m_clientData[n];
}
void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
wxList::compatibility_iterator node = m_clientList.Item( n );
wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
// wxItemContainer already deletes data for us
node->SetData( (wxObject*) clientData );
}
wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
wxList::compatibility_iterator node = m_clientList.Item( n );
wxCHECK_MSG( node, (wxClientData *)NULL,
wxT("invalid index in wxChoice::DoGetItemClientObject") );
return (wxClientData*) node->GetData();
}
void wxChoice::Clear()
void wxChoice::DoClear()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
@@ -217,19 +184,7 @@ void wxChoice::Clear()
GtkWidget *menu = gtk_menu_new();
gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
if ( HasClientObjectData() )
{
// destroy the data (due to Robert's idea of using wxList<wxObject>
// and not wxList<wxClientData> we can't just say
// m_clientList.DeleteContents(true) - this would crash!
wxList::compatibility_iterator node = m_clientList.GetFirst();
while ( node )
{
delete (wxClientData *)node->GetData();
node = node->GetNext();
}
}
m_clientList.Clear();
m_clientData.Clear();
if ( m_strings )
m_strings->Clear();
@@ -238,16 +193,11 @@ void wxChoice::Clear()
m_selection_hack = wxNOT_FOUND;
}
void wxChoice::Delete(unsigned int n)
void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
// VZ: apparently GTK+ doesn't have a built-in function to do it (not even
// in 2.0), hence this dumb implementation -- still better than nothing
unsigned int i;
const unsigned int count = GetCount();
// if the item to delete is before the selection, and the selection is valid
if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
{
@@ -260,56 +210,30 @@ void wxChoice::Delete(unsigned int n)
m_selection_hack = wxNOT_FOUND;
}
const bool hasClientData = m_clientDataItemsType != wxClientData_None;
const bool hasObjectData = m_clientDataItemsType == wxClientData_Object;
wxList::compatibility_iterator node = m_clientList.GetFirst();
// VZ: apparently GTK+ doesn't have a built-in function to do it (not even
// in 2.0), hence this dumb implementation -- still better than nothing
const unsigned int count = GetCount();
wxArrayString items;
wxArrayPtrVoid itemsData;
items.Alloc(count);
for ( i = 0; i < count; i++ )
itemsData.Alloc(count);
for ( unsigned i = 0; i < count; i++ )
{
if ( i != n )
{
items.Add(GetString(i));
if ( hasClientData )
{
// also save the client data
itemsData.Add(node->GetData());
}
}
else // need to delete the client object too
{
if ( hasObjectData )
{
delete (wxClientData *)node->GetData();
}
}
if ( hasClientData )
{
node = node->GetNext();
itemsData.Add(m_clientData[i]);
}
}
if ( hasObjectData )
{
// prevent Clear() from destroying all client data
m_clientDataItemsType = wxClientData_None;
}
wxChoice::DoClear();
Clear();
for ( i = 0; i < count - 1; i++ )
{
Append(items[i]);
if ( hasObjectData )
SetClientObject(i, (wxClientData *)itemsData[i]);
else if ( hasClientData )
SetClientData(i, itemsData[i]);
}
void ** const data = &itemsData[0];
if ( HasClientObjectData() )
Append(items, wx_reinterpret_cast(wxClientData **, data));
else
Append(items, data);
}
int wxChoice::FindString( const wxString &string, bool bCase ) const
@@ -482,47 +406,24 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)
{
wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index"));
wxCHECK_MSG(pos<=m_clientData.GetCount(), -1, wxT("invalid index"));
GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
unsigned int index;
if ( m_strings )
{
// sorted control, need to insert at the correct index
index = m_strings->Add(item);
gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, index );
if ( index )
{
m_clientList.Insert( m_clientList.Item(index - 1),
(wxObject*) NULL );
}
else
{
m_clientList.Insert( (wxObject*) NULL );
}
pos = m_strings->Add(item);
}
// don't call wxChoice::GetCount() from here because it doesn't work
// if we're called from ctor (and GtkMenuShell is still NULL)
if (pos == m_clientData.GetCount())
gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
else
{
// don't call wxChoice::GetCount() from here because it doesn't work
// if we're called from ctor (and GtkMenuShell is still NULL)
gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );
// normal control, just append
if (pos == m_clientList.GetCount())
{
gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
m_clientList.Append( (wxObject*) NULL );
index = m_clientList.GetCount() - 1;
}
else
{
gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );
m_clientList.Insert( pos, (wxObject*) NULL );
index = pos;
}
}
m_clientData.Insert( NULL, pos );
if (GTK_WIDGET_REALIZED(m_widget))
{
@@ -545,7 +446,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& it
gtk_widget_show( menu_item );
// return the index of the item in the control
return index;
return pos;
}
wxSize wxChoice::DoGetBestSize() const