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

32
src/gtk/combobox.cpp
View File

@@ -197,12 +197,12 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
wxComboBox::~wxComboBox()
{
wxNode *node = m_clientObjectList.First();
wxNode *node = m_clientObjectList.GetFirst();
while (node)
{
wxClientData *cd = (wxClientData*)node->Data();
wxClientData *cd = (wxClientData*)node->GetData();
if (cd) delete cd;
node = node->Next();
node = node->GetNext();
}
m_clientObjectList.Clear();
@@ -272,7 +272,7 @@ void wxComboBox::SetClientData( int n, void* clientData )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
wxNode *node = m_clientDataList.Item( n );
if (!node) return;
node->SetData( (wxObject*) clientData );
@@ -282,20 +282,20 @@ void* wxComboBox::GetClientData( int n )
{
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
wxNode *node = m_clientDataList.Item( n );
if (!node) return NULL;
return node->Data();
return node->GetData();
}
void wxComboBox::SetClientObject( int n, wxClientData* clientData )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
wxNode *node = m_clientObjectList.Item( n );
if (!node) return;
wxClientData *cd = (wxClientData*) node->Data();
wxClientData *cd = (wxClientData*) node->GetData();
if (cd) delete cd;
node->SetData( (wxObject*) clientData );
@@ -305,10 +305,10 @@ wxClientData* wxComboBox::GetClientObject( int n )
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
wxNode *node = m_clientObjectList.Item( n );
if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->Data();
return (wxClientData*) node->GetData();
}
void wxComboBox::Clear()
@@ -318,12 +318,12 @@ void wxComboBox::Clear()
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, Number() );
wxNode *node = m_clientObjectList.First();
wxNode *node = m_clientObjectList.GetFirst();
while (node)
{
wxClientData *cd = (wxClientData*)node->Data();
wxClientData *cd = (wxClientData*)node->GetData();
if (cd) delete cd;
node = node->Next();
node = node->GetNext();
}
m_clientObjectList.Clear();
@@ -348,15 +348,15 @@ void wxComboBox::Delete( int n )
gtk_list_remove_items( listbox, list );
g_list_free( list );
wxNode *node = m_clientObjectList.Nth( n );
wxNode *node = m_clientObjectList.Item( n );
if (node)
{
wxClientData *cd = (wxClientData*)node->Data();
wxClientData *cd = (wxClientData*)node->GetData();
if (cd) delete cd;
m_clientObjectList.DeleteNode( node );
}
node = m_clientDataList.Nth( n );
node = m_clientDataList.Item( n );
if (node)
{
m_clientDataList.DeleteNode( node );