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

Split this out from other changes to keep things sane..

Browse Source 
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-13 05:17:41 +00:00
parent 5797172366
commit b1d4dd7add
59 changed files with 1099 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gtk1/listbox.cpp
View File

@@ -447,7 +447,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
if (index != GetCount())
{
GtkAddItem( items[n], index );
wxNode *node = m_clientList.Nth( index );
wxNode *node = m_clientList.Item( index );
m_clientList.Insert( node, (wxObject*) NULL );
}
else
@@ -470,7 +470,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
}
else
{
wxNode *node = m_clientList.Nth( pos );
wxNode *node = m_clientList.Item( pos );
for ( size_t n = 0; n < nItems; n++ )
{
GtkAddItem( items[n], pos+n );
@@ -496,7 +496,7 @@ int wxListBox::DoAppend( const wxString& item )
{
GtkAddItem( item, index );
wxNode *node = m_clientList.Nth( index );
wxNode *node = m_clientList.Item( index );
m_clientList.Insert( node, (wxObject *)NULL );
return index;
@@ -618,11 +618,11 @@ void wxListBox::Clear()
// 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!
wxNode *node = m_clientList.First();
wxNode *node = m_clientList.GetFirst();
while ( node )
{
delete (wxClientData *)node->Data();
node = node->Next();
delete (wxClientData *)node->GetData();
node = node->GetNext();
}
}
m_clientList.Clear();
@@ -643,12 +643,12 @@ void wxListBox::Delete( int n )
gtk_list_remove_items( m_list, list );
g_list_free( list );
wxNode *node = m_clientList.Nth( n );
wxNode *node = m_clientList.Item( n );
if ( node )
{
if ( m_clientDataItemsType == wxClientData_Object )
{
wxClientData *cd = (wxClientData*)node->Data();
wxClientData *cd = (wxClientData*)node->GetData();
delete cd;
}
@@ -667,7 +667,7 @@ void wxListBox::DoSetItemClientData( int n, void* clientData )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
wxNode *node = m_clientList.Nth( n );
wxNode *node = m_clientList.Item( n );
wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
node->SetData( (wxObject*) clientData );
@@ -677,17 +677,17 @@ void* wxListBox::DoGetItemClientData( int n ) const
{
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
wxNode *node = m_clientList.Nth( n );
wxNode *node = m_clientList.Item( n );
wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
return node->Data();
return node->GetData();
}
void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
wxNode *node = m_clientList.Nth( n );
wxNode *node = m_clientList.Item( n );
wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
// wxItemContainer already deletes data for us
@@ -699,11 +699,11 @@ wxClientData* wxListBox::DoGetItemClientObject( int n ) const
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
wxNode *node = m_clientList.Nth( n );
wxNode *node = m_clientList.Item( n );
wxCHECK_MSG( node, (wxClientData *)NULL,
wxT("invalid index in wxListBox::DoGetItemClientObject") );
return (wxClientData*) node->Data();
return (wxClientData*) node->GetData();
}
// ----------------------------------------------------------------------------