X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30ed6e5c897215ee8647b7954ad933ed3a765738..7db33cc31068fcbc0444a3b93829833662fb977a:/src/gtk1/combobox.cpp

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 13d19d958b..60bbf8f50d 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/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();
@@ -220,9 +223,9 @@ void wxComboBox::SetFocus()
     gtk_widget_grab_focus( m_focusWidget );
 }
 
-void wxComboBox::AppendCommon( const wxString &item )
+int wxComboBox::AppendCommon( const wxString &item )
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
     DisableEvents();
 
@@ -243,43 +246,45 @@ void wxComboBox::AppendCommon( const wxString &item )
     gtk_widget_show( list_item );
 
     EnableEvents();
+
+    return GetCount() - 1;
 }
 
-void wxComboBox::Append( const wxString &item )
+int wxComboBox::Append( const wxString &item )
 {
     m_clientDataList.Append( (wxObject*) NULL );
     m_clientObjectList.Append( (wxObject*) NULL );
 
-    AppendCommon( item );
+    return AppendCommon( item );
 }
 
-void wxComboBox::Append( const wxString &item, void *clientData )
+int wxComboBox::Append( const wxString &item, void *clientData )
 {
     m_clientDataList.Append( (wxObject*) clientData );
     m_clientObjectList.Append( (wxObject*)NULL );
 
-    AppendCommon( item );
+    return AppendCommon( item );
 }
 
-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
+int wxComboBox::Append( const wxString &item, wxClientData *clientData )
 {
     m_clientDataList.Append( (wxObject*) NULL );
     m_clientObjectList.Append( (wxObject*) clientData );
 
-    AppendCommon( item );
+    return AppendCommon( item );
 }
 
-void wxComboBox::InsertCommon( const wxString &item, int pos )
+int wxComboBox::InsertCommon( const wxString &item, int pos )
 {
-    wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list"));
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
+                    wxT("can't insert into sorted list"));
+
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
     int count = GetCount();
-    wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index"));
     if (pos == count)
     {
-        AppendCommon(item);
-        return;
+        return AppendCommon(item);
     }
 
     DisableEvents();
@@ -297,70 +302,70 @@ void wxComboBox::InsertCommon( const wxString &item, int pos )
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
-        if (m_widgetStyle) ApplyWidgetStyle();
+        if (m_widgetStyle)
+            ApplyWidgetStyle();
     }
 
     gtk_widget_show( list_item );
 
     EnableEvents();
+
+    return pos;
 }
 
-void wxComboBox::Insert( const wxString &item, int pos )
+int wxComboBox::Insert( const wxString &item, int pos )
 {
-    wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list"));
-    int count = GetCount();
-    wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index"));
+    const int count = GetCount();
+    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+
     if (pos == count)
     {
-        Append(item);
-        return;
+        return Append(item);
     }
 
     m_clientDataList.Insert( pos, (wxObject*) NULL );
     m_clientObjectList.Insert( pos, (wxObject*) NULL );
 
-    InsertCommon( item, pos );
+    return InsertCommon( item, pos );
 }
 
-void wxComboBox::Insert( const wxString &item, int pos, void *clientData )
+int wxComboBox::Insert( const wxString &item, int pos, void *clientData )
 {
-    wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list"));
     int count = GetCount();
-    wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index"));
+    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+
     if (pos == count)
     {
-        Append(item, clientData);
-        return;
+        return Append(item, clientData);
     }
 
     m_clientDataList.Insert( pos, (wxObject*) clientData );
     m_clientObjectList.Insert( pos, (wxObject*)NULL );
 
-    InsertCommon( item, pos );
+    return InsertCommon( item, pos );
 }
 
-void wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData )
+int wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData )
 {
-    wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list"));
     int count = GetCount();
-    wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index"));
+    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+
     if (pos == count)
     {
-        Append(item, clientData);
-        return;
+        return Append(item, clientData);
     }
 
     m_clientDataList.Insert( pos, (wxObject*) NULL );
     m_clientObjectList.Insert( pos, (wxObject*) clientData );
 
-    InsertCommon( item, pos );
+    return InsertCommon( item, pos );
 }
 
 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 +375,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 +384,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 +397,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 +411,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 +445,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();
 }