Removed code duplication introduced during wxUniv merge in 1.132

[wxWidgets.git] / src / gtk1 / combobox.cpp

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 13d19d958b4b3ff85b4ee2296a081d92529cb76d..f295daac11ac6cbabc4a3f649beb6808a66030e2 100644 (file)
--- 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
@@ -155,6 +158,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_focusWidget = combo->entry;
 
     PostCreation();
+    InheritAttributes();
 
     ConnectWidget( combo->button );
 
@@ -187,9 +191,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
         gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
     }
 
-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );
-
     Show( TRUE );
 
     return TRUE;
@@ -197,7 +198,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 +221,9 @@ void wxComboBox::SetFocus()
     gtk_widget_grab_focus( m_focusWidget );
 }
 
-void wxComboBox::AppendCommon( const wxString &item )
+int wxComboBox::DoAppend( const wxString &item )
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
     DisableEvents();
 
@@ -242,45 +243,30 @@ void wxComboBox::AppendCommon( const wxString &item )
 
     gtk_widget_show( list_item );
 
-    EnableEvents();
-}
+    const int count = GetCount();
 
-void wxComboBox::Append( const wxString &item )
-{
+    if ( (int)m_clientDataList.GetCount() < count )
     m_clientDataList.Append( (wxObject*) NULL );
+    if ( (int)m_clientObjectList.GetCount() < count )
     m_clientObjectList.Append( (wxObject*) NULL );
 
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
+    EnableEvents();
 
-    AppendCommon( item );
+    return count - 1;
 }
 
-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
+int wxComboBox::DoInsert( const wxString &item, int pos )
 {
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
-
-    AppendCommon( item );
-}
+    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
+                    wxT("can't insert into sorted list"));
 
-void 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( m_widget != NULL, -1, wxT("invalid combobox") );
 
     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)
-    {
-        AppendCommon(item);
-        return;
-    }
+        return Append(item);
 
     DisableEvents();
 
@@ -297,89 +283,48 @@ 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();
-}
-
-void 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"));
-    if (pos == count)
-    {
-        Append(item);
-        return;
-    }
+    count = GetCount();
 
+    if ( (int)m_clientDataList.GetCount() < count )
     m_clientDataList.Insert( pos, (wxObject*) NULL );
+    if ( (int)m_clientObjectList.GetCount() < count )
     m_clientObjectList.Insert( pos, (wxObject*) NULL );
 
-    InsertCommon( item, pos );
-}
-
-void 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"));
-    if (pos == count)
-    {
-        Append(item, clientData);
-        return;
-    }
-
-    m_clientDataList.Insert( pos, (wxObject*) clientData );
-    m_clientObjectList.Insert( pos, (wxObject*)NULL );
-
-    InsertCommon( item, pos );
-}
-
-void 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"));
-    if (pos == count)
-    {
-        Append(item, clientData);
-        return;
-    }
-
-    m_clientDataList.Insert( pos, (wxObject*) NULL );
-    m_clientObjectList.Insert( pos, (wxObject*) clientData );
+    EnableEvents();
 
-    InsertCommon( item, pos );
+    return pos;
 }
 
-void wxComboBox::SetClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData( 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 );
 }
 
-void* wxComboBox::GetClientData( int n ) const
+void* wxComboBox::DoGetItemClientData( 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;
 }
 
-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
+void wxComboBox::DoSetItemClientObject( 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();
@@ -388,11 +333,11 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
     node->SetData( (wxObject*) clientData );
 }
 
-wxClientData* wxComboBox::GetClientObject( int n ) const
+wxClientData* wxComboBox::DoGetItemClientObject( 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;
 }
@@ -404,9 +349,9 @@ void wxComboBox::Clear()
     DisableEvents();
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+    gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
 
-    wxNode *node = m_clientObjectList.GetFirst();
+    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
     while (node)
     {
         wxClientData *cd = (wxClientData*)node->GetData();
@@ -440,18 +385,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();
 }
 
@@ -474,7 +419,7 @@ void wxComboBox::SetString(int n, const wxString &text)
     }
 }
 
-int wxComboBox::FindString( const wxString &item )
+int wxComboBox::FindString( const wxString &item ) const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
@@ -573,7 +518,7 @@ wxString wxComboBox::GetStringSelection() const
     return wxT("");
 }
 
-int wxComboBox::Number() const
+int wxComboBox::GetCount() const
 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 
@@ -663,17 +608,13 @@ void wxComboBox::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
+    if ( pos == GetLastPosition() )
+        pos = -1;
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
 }
 
-void wxComboBox::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    SetInsertionPoint( -1 );
-}
-
 long wxComboBox::GetInsertionPoint() const
 {
     return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
@@ -703,14 +644,6 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 #endif
 }
 
-void wxComboBox::Remove(long from, long to)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
 void wxComboBox::SetSelection( long from, long to )
 {
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;