X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30ed6e5c897215ee8647b7954ad933ed3a765738..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 13d19d958b..29eaf88f4f 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "combobox.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/combobox.h"
 
 #if wxUSE_COMBOBOX
@@ -197,7 +200,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
 wxComboBox::~wxComboBox()
 {
-    wxNode *node = m_clientObjectList.GetFirst();
+    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
     while (node)
     {
         wxClientData *cd = (wxClientData*)node->GetData();
@@ -360,7 +363,7 @@ void wxComboBox::SetClientData( int n, void* clientData )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    wxNode *node = m_clientDataList.Item( n );
+    wxList::compatibility_iterator node = m_clientDataList.Item( n );
     if (!node) return;
 
     node->SetData( (wxObject*) clientData );
@@ -370,7 +373,7 @@ void* wxComboBox::GetClientData( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
 
-    wxNode *node = m_clientDataList.Item( n );
+    wxList::compatibility_iterator node = m_clientDataList.Item( n );
 
     return node ? node->GetData() : NULL;
 }
@@ -379,7 +382,7 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    wxNode *node = m_clientObjectList.Item( n );
+    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
     if (!node) return;
 
     wxClientData *cd = (wxClientData*) node->GetData();
@@ -392,7 +395,7 @@ wxClientData* wxComboBox::GetClientObject( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
 
-    wxNode *node = m_clientObjectList.Item( n );
+    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
 
     return node ? (wxClientData*) node->GetData() : NULL;
 }
@@ -406,7 +409,7 @@ void wxComboBox::Clear()
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     gtk_list_clear_items( GTK_LIST(list), 0, Number() );
 
-    wxNode *node = m_clientObjectList.GetFirst();
+    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
     while (node)
     {
         wxClientData *cd = (wxClientData*)node->GetData();
@@ -440,18 +443,18 @@ void wxComboBox::Delete( int n )
     gtk_list_remove_items( listbox, list );
     g_list_free( list );
 
-    wxNode *node = m_clientObjectList.Item( n );
+    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
     if (node)
     {
         wxClientData *cd = (wxClientData*)node->GetData();
         if (cd) delete cd;
-        m_clientObjectList.DeleteNode( node );
+        m_clientObjectList.Erase( node );
     }
 
     node = m_clientDataList.Item( n );
     if (node)
-        m_clientDataList.DeleteNode( node );
-
+        m_clientDataList.Erase( node );
+    
     EnableEvents();
 }