X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e324a3fbfdac39f15ba0b96b97e1f3035ce8dd7..1722a3f626f7b29b42a22fc6329ce12fb5e8ed90:/src/gtk/combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 9a1c2100bb..91207fc70a 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/gtk/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,51 +7,47 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#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
 
-#include "wx/settings.h"
-#include "wx/arrstr.h"
-#include "wx/intl.h"
+#include "wx/combobox.h"
 
-#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/arrstr.h"
+#endif
 
+// We use GtkCombo which has been deprecated since GTK+ 2.3.0
+// in favour of GtkComboBox for <GTK2.4 runtime
+// We also use GtkList
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
+static int    g_SelectionBeforePopup = wxID_NONE; // this means the popup is hidden
 
 //-----------------------------------------------------------------------------
 //  "changed" - typing and list item matches get changed, select-child
 //              if it doesn't match an item then just get a single changed
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtkcombo_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (combo->m_ignoreNextUpdate)
     {
-        combo->m_ignoreNextUpdate = FALSE;
+        combo->m_ignoreNextUpdate = false;
         return;
     }
 
@@ -62,26 +58,69 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
     event.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event );
 }
+}
+
+extern "C" {
+static void
+gtkcombo_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+{
+}
+}
+
+extern "C" {
+static void
+gtkcombo_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{
+    // when the popup is hidden, throw a SELECTED event only if the combobox
+    // selection changed.
+    const int curSelection = combo->GetCurrentSelection();
+
+    const bool hasChanged = curSelection != g_SelectionBeforePopup;
+
+    // reset the selection flag to value meaning that it is hidden and do it
+    // now, before generating the events, so that GetSelection() returns the
+    // new value from the event handler
+    g_SelectionBeforePopup = wxID_NONE;
+
+    if ( hasChanged )
+    {
+        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+        event.SetInt( curSelection );
+        event.SetString( combo->GetStringSelection() );
+        event.SetEventObject( combo );
+        combo->GetEventHandler()->ProcessEvent( event );
+
+        // for consistency with the other ports, send TEXT event
+        wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+        event2.SetString( combo->GetStringSelection() );
+        event2.SetEventObject( combo );
+        combo->GetEventHandler()->ProcessEvent( event2 );
+    }
+}
+}
 
+extern "C" {
 static void
-gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+gtkcombo_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
 {
+    // store the combobox selection value before the popup is shown
+    g_SelectionBeforePopup = combo->GetCurrentSelection();
+}
 }
 
 //-----------------------------------------------------------------------------
 // "select-child" - click/cursor get select-child, changed, select-child
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
-gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!combo->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
 
-    int curSelection = combo->GetSelection();
+    int curSelection = combo->GetCurrentSelection();
 
     if (combo->m_prevSelection == curSelection) return;
 
@@ -93,25 +132,68 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
     // Quickly set the value of the combo box
     // as GTK+ does that only AFTER the event
     // is sent.
-    gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
+    GtkWidget* entry = GTK_COMBO(combo->GetHandle())->entry;
+    g_signal_handlers_block_by_func(
+        entry, (gpointer)gtkcombo_text_changed_callback, combo);
     combo->SetValue( combo->GetStringSelection() );
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
+    g_signal_handlers_unblock_by_func(
+        entry, (gpointer)gtkcombo_text_changed_callback, combo);
+
+    // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE)
+    // because when combobox popup is shown, gtkcombo_combo_select_child_callback is
+    // called each times the mouse is over an item with a pressed button so a lot
+    // of SELECTED event could be generated if the user keep the mouse button down
+    // and select other items ...
+    if (g_SelectionBeforePopup == wxID_NONE)
+    {
+        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+        event.SetInt( curSelection );
+        event.SetString( combo->GetStringSelection() );
+        event.SetEventObject( combo );
+        combo->GetEventHandler()->ProcessEvent( event );
+
+        // for consistency with the other ports, don't generate text update
+        // events while the user is browsing the combobox neither
+        wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+        event2.SetString( combo->GetValue() );
+        event2.SetEventObject( combo );
+        combo->GetEventHandler()->ProcessEvent( event2 );
+    }
+}
+}
+
+#ifdef __WXGTK24__
+extern "C" {
+static void
+gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+{
+    if (!combo->m_hasVMT) return;
+
+    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+    event.SetString( combo->GetValue() );
+    event.SetEventObject( combo );
+    combo->GetEventHandler()->ProcessEvent( event );
+}
+}
+
+extern "C" {
+static void
+gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+{
+    if (!combo->m_hasVMT) return;
+
+    if (combo->GetSelection() == -1)
+        return;
 
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( curSelection );
+    event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
-
     combo->GetEventHandler()->ProcessEvent( event );
-
-    // Now send the event ourselves
-    wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-    event2.SetString( combo->GetValue() );
-    event2.SetEventObject( combo );
-    combo->GetEventHandler()->ProcessEvent( event2 );
 }
+}
+
+#endif
 
 //-----------------------------------------------------------------------------
 // wxComboBox
@@ -159,93 +241,122 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          long style, const wxValidator& validator,
                          const wxString& name )
 {
-    m_ignoreNextUpdate = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_strings = NULL;
+    m_ignoreNextUpdate = false;
     m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxComboBox creation failed") );
-        return FALSE;
+        return false;
     }
 
-    m_widget = gtk_combo_new();
-    GtkCombo *combo = GTK_COMBO(m_widget);
-
-    // Disable GTK's broken events ...
-    gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id );
-    // ... and add surogate handler.
-    combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
-			      (GtkSignalFunc) gtk_dummy_callback, combo);
-
-    // make it more useable
-    gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
+    if(HasFlag(wxCB_SORT))
+        m_strings = new wxSortedArrayString();
 
-    // and case-sensitive
-    gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_widget = gtk_combo_box_entry_new_text();
 
-#ifndef __WXGTK20__
-    // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+        gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE );
+    }
+    else
 #endif
-
-    for (int i = 0; i < n; i++)
     {
-        GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );
+        m_widget = gtk_combo_new();
+        GtkCombo* combo = GTK_COMBO(m_widget);
 
-        m_clientDataList.Append( (wxObject*)NULL );
-        m_clientObjectList.Append( (wxObject*)NULL );
+        // Disable GTK's broken events ...
+        g_signal_handler_disconnect (combo->entry, combo->entry_change_id);
+        // ... and add surrogate handler.
+        combo->entry_change_id = g_signal_connect (combo->entry, "changed",
+                                               G_CALLBACK (gtkcombo_dummy_callback),
+                                               combo);
 
-        gtk_container_add( GTK_CONTAINER(list), list_item );
+        // make it more useable
+        gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
 
-        gtk_widget_show( list_item );
+        // and case-sensitive
+        gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
+
+        if (style & wxNO_BORDER)
+            g_object_set (combo->entry, "has-frame", FALSE, NULL );
     }
 
+    Append(n, choices);
+
     m_parent->DoAddChild( this );
 
-    m_focusWidget = combo->entry;
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    m_focusWidget = GTK_WIDGET( entry );
 
     PostCreation(size);
 
-    ConnectWidget( combo->button );
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        ConnectWidget( m_widget );
+    else
+#endif
+        ConnectWidget( GTK_COMBO(m_widget)->button );
 
-    // MSW's combo box shows the value and the selection is -1
-    gtk_entry_set_text( GTK_ENTRY(combo->entry), wxGTK_CONV(value) );
-    gtk_list_unselect_all( GTK_LIST(combo->list) );
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        gtk_entry_set_text( entry, wxGTK_CONV(value) );
 
-    if (style & wxCB_READONLY)
-        gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
+        if (style & wxCB_READONLY)
+            gtk_entry_set_editable( entry, FALSE );
 
-    gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
+        g_signal_connect_after (entry, "changed",
+                            G_CALLBACK (gtkcombobox_text_changed_callback), this);
 
-    gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
-      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
+        g_signal_connect_after (m_widget, "changed",
+                            G_CALLBACK (gtkcombobox_changed_callback), this);
 
-    SetBestSize(size); // need this too because this is a wxControlWithItems
+    }
+    else
+#endif
+    {
+        GtkCombo *combo = GTK_COMBO(m_widget);
+        // MSW's combo box shows the value and the selection is -1
+        gtk_entry_set_text( entry, wxGTK_CONV(value) );
+        gtk_list_unselect_all( GTK_LIST(combo->list) );
+
+        if (style & wxCB_READONLY)
+            gtk_entry_set_editable( entry, FALSE );
+
+        // "show" and "hide" events are generated when user click on the combobox button which popups a list
+        // this list is the "popwin" gtk widget
+        g_signal_connect (GTK_COMBO(combo)->popwin, "hide",
+                      G_CALLBACK (gtkcombo_popup_hide_callback), this);
+        g_signal_connect (GTK_COMBO(combo)->popwin, "show",
+                      G_CALLBACK (gtkcombo_popup_show_callback), this);
+        g_signal_connect_after (combo->list, "select-child",
+                            G_CALLBACK (gtkcombo_combo_select_child_callback),
+                            this);
+        g_signal_connect_after (entry, "changed",
+                            G_CALLBACK (gtkcombo_text_changed_callback), this);
+    }
 
-    // This is required for tool bar support
-    wxSize setsize = GetSize();
-    gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
+    SetInitialSize(size); // need this too because this is a wxControlWithItems
 
-    return TRUE;
+    return true;
 }
 
 wxComboBox::~wxComboBox()
 {
-    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        node = node->GetNext();
-    }
-    m_clientObjectList.Clear();
+    Clear();
 
-    m_clientDataList.Clear();
+    delete m_strings;
 }
 
 void wxComboBox::SetFocus()
@@ -259,243 +370,251 @@ void wxComboBox::SetFocus()
     gtk_widget_grab_focus( m_focusWidget );
 }
 
-int wxComboBox::DoAppend( const wxString &item )
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type)
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
-    DisableEvents();
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+                 _T("In a sorted combobox data could only be appended"));
 
-    GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
+    const int count = items.GetCount();
 
-    gtk_container_add( GTK_CONTAINER(list), list_item );
-
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
-    }
+    int n = wxNOT_FOUND;
 
-    // Apply current widget style to the new list_item
-    GtkRcStyle *style = CreateWidgetStyle();
-    if (style)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
-        GtkBin *bin = GTK_BIN( list_item );
-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
-        gtk_rc_style_unref( style );
-    }
-
-    gtk_widget_show( list_item );
-
-    const int count = GetCount();
-
-    if ( (int)m_clientDataList.GetCount() < count )
-    m_clientDataList.Append( (wxObject*) NULL );
-    if ( (int)m_clientObjectList.GetCount() < count )
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    EnableEvents();
-
-    InvalidateBestSize();
-
-    return count - 1;
-}
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        for( int i = 0; i < count; ++i )
+        {
+            n = pos + i;
+            // If sorted, use this wxSortedArrayStrings to determine
+            // the right insertion point
+            if(m_strings)
+                n = m_strings->Add(items[i]);
 
-int wxComboBox::DoInsert( const wxString &item, int pos )
-{
-    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
-                    wxT("can't insert into sorted list"));
+            gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );
 
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+            m_clientData.Insert( NULL, n );
+            AssignNewItemClientData(n, clientData, i, type);
+        }
+    }
+    else
+#endif
+    {
+        DisableEvents();
 
-    int count = GetCount();
-    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+        for( int i = 0; i < count; ++i )
+        {
+            n = pos + i;
+            // If sorted, use this wxSortedArrayStrings to determine
+            // the right insertion point
+            if(m_strings)
+                n = m_strings->Add(items[i]);
 
-    if (pos == count)
-        return Append(item);
+            GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( items[i] ) );
 
-    DisableEvents();
+            // TODO construct a list with all items and call gtk_list_insert_items once?
+            GList *gitem_list = g_list_alloc ();
+            gitem_list->data = list_item;
+            gtk_list_insert_items( GTK_LIST (list), gitem_list, n );
 
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+            m_clientData.Insert( NULL, n );
+            AssignNewItemClientData(n, clientData, i, type);
 
-    GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
+            if (GTK_WIDGET_REALIZED(m_widget))
+            {
+                gtk_widget_realize( list_item );
+                gtk_widget_realize( GTK_BIN(list_item)->child );
 
-    GList *gitem_list = g_list_alloc ();
-    gitem_list->data = list_item;
-    gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+                ApplyWidgetStyle();
+            }
 
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
+            gtk_widget_show( list_item );
+        }
 
-        ApplyWidgetStyle();
+        EnableEvents();
     }
 
-    gtk_widget_show( list_item );
-
-    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 );
-
-    EnableEvents();
-
     InvalidateBestSize();
 
-    return pos;
+    return n;
 }
 
-void wxComboBox::DoSetItemClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-    if (!node) return;
-
-    node->SetData( (wxObject*) clientData );
+    m_clientData[n] = clientData;
 }
 
-void* wxComboBox::DoGetItemClientData( int n ) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-
-    return node ? node->GetData() : NULL;
+    return m_clientData[n];
 }
 
-void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (!node) return;
-
-    // wxItemContainer already deletes data for us
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxComboBox::DoGetItemClientObject( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-
-    return node ? (wxClientData*) node->GetData() : NULL;
-}
-
-void wxComboBox::Clear()
+void wxComboBox::DoClear()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     DisableEvents();
 
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
-
-    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
-    while (node)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        node = node->GetNext();
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        const unsigned int count = GetCount();
+        for (unsigned int i = 0; i < count; i++)
+            gtk_combo_box_remove_text( combobox, 0 );
     }
-    m_clientObjectList.Clear();
+    else // GTK+ < 2.4.0
+#endif // __WXGTK24__
+    {
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+        gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
+    }
+
+    m_clientData.Clear();
 
-    m_clientDataList.Clear();
+    if(m_strings)
+        m_strings->Clear();
 
     EnableEvents();
 
     InvalidateBestSize();
 }
 
-void wxComboBox::Delete( int n )
+void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-
-    GList *child = g_list_nth( listbox->children, n );
-
-    if (!child)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        wxFAIL_MSG(wxT("wrong index"));
-        return;
+        wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        gtk_combo_box_remove_text( combobox, n );
     }
+    else
+#endif
+    {
+        GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
 
-    DisableEvents();
+        GList *child = g_list_nth( listbox->children, n );
 
-    GList *list = g_list_append( (GList*) NULL, child->data );
-    gtk_list_remove_items( listbox, list );
-    g_list_free( list );
+        if (!child)
+        {
+            wxFAIL_MSG(wxT("wrong index"));
+            return;
+        }
 
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        m_clientObjectList.Erase( node );
-    }
+        DisableEvents();
 
-    node = m_clientDataList.Item( n );
-    if (node)
-        m_clientDataList.Erase( node );
+        GList *list = g_list_append( (GList*) NULL, child->data );
+        gtk_list_remove_items( listbox, list );
+        g_list_free( list );
 
-    EnableEvents();
+        EnableEvents();
+    }
+
+    m_clientData.RemoveAt( n );
+    if(m_strings)
+        m_strings->RemoveAt( n );
 
     InvalidateBestSize();
 }
 
-void wxComboBox::SetString(int n, const wxString &text)
+void wxComboBox::SetString(unsigned int n, const wxString &text)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = g_list_nth( GTK_LIST(list)->children, n );
-    if (child)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        gtk_label_set_text(label, wxGTK_CONV(text));
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
+        GtkTreeModel *model = gtk_combo_box_get_model( combobox );
+        GtkTreeIter iter;
+        if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
+        {
+            GValue value = { 0, };
+            g_value_init( &value, G_TYPE_STRING );
+            g_value_set_string( &value, wxGTK_CONV( text ) );
+            gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, 0, &value );
+            g_value_unset( &value );
+        }
     }
     else
+#endif
     {
-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+        GList *child = g_list_nth( GTK_LIST(list)->children, n );
+        if (child)
+        {
+            GtkBin *bin = GTK_BIN( child->data );
+            GtkLabel *label = GTK_LABEL( bin->child );
+            gtk_label_set_text(label, wxGTK_CONV(text));
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+        }
     }
 
     InvalidateBestSize();
 }
 
-int wxComboBox::FindString( const wxString &item ) const
+int wxComboBox::FindString( const wxString &item, bool bCase ) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );
 
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-#ifdef __WXGTK20__
-        wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
-        wxString str( label->label );
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+        GtkTreeIter iter;
+        gtk_tree_model_get_iter_first( model, &iter );
+        if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
+            return -1;
+        int count = 0;
+        do
+        {
+            GValue value = { 0, };
+            gtk_tree_model_get_value( model, &iter, 0, &value );
+            wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
+            g_value_unset( &value );
+
+            if (item.IsSameAs( str, bCase ) )
+                return count;
+
+            count++;
+
+        } while (gtk_tree_model_iter_next( model, &iter ));
+    }
+    else
 #endif
-        if (item == str)
-            return count;
+    {
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+        GList *child = GTK_LIST(list)->children;
+        int count = 0;
+        while (child)
+        {
+            GtkBin *bin = GTK_BIN( child->data );
+            GtkLabel *label = GTK_LABEL( bin->child );
+            wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+
+            if (item.IsSameAs( str , bCase ) )
+                return count;
 
-        count++;
-        child = child->next;
+            count++;
+            child = child->next;
+        }
     }
 
     return wxNOT_FOUND;
@@ -503,47 +622,89 @@ int wxComboBox::FindString( const wxString &item ) const
 
 int wxComboBox::GetSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        return gtk_combo_box_get_active( combobox );
+    }
+    else
+#endif
+        // if the popup is currently opened, use the selection as it had been
+        // before it dropped down
+        return g_SelectionBeforePopup == wxID_NONE ? GetCurrentSelection()
+                                               : g_SelectionBeforePopup;
+}
 
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+int wxComboBox::GetCurrentSelection() const
+{
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        GList *child = GTK_LIST(list)->children;
-        int count = 0;
-        while (child)
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        return gtk_combo_box_get_active( combobox );
+    }
+    else
+#endif
+    {
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+        GList *selection = GTK_LIST(list)->selection;
+        if (selection)
         {
-            if (child->data == selection->data) return count;
-            count++;
-            child = child->next;
+            GList *child = GTK_LIST(list)->children;
+            int count = 0;
+            while (child)
+            {
+                if (child->data == selection->data) return count;
+                count++;
+                child = child->next;
+            }
         }
     }
 
     return -1;
 }
 
-wxString wxComboBox::GetString( int n ) const
+wxString wxComboBox::GetString(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
 
     wxString str;
-    GList *child = g_list_nth( GTK_LIST(list)->children, n );
-    if (child)
+
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-#ifdef __WXGTK20__
-        str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
-#else
-        str = wxString( label->label );
-#endif
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        GtkTreeModel *model = gtk_combo_box_get_model( combobox );
+        GtkTreeIter iter;
+        if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
+        {
+            GValue value = { 0, };
+            gtk_tree_model_get_value( model, &iter, 0, &value );
+            wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) );
+            g_value_unset( &value );
+            return tmp;
+        }
     }
     else
+#endif
     {
-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+        GList *child = g_list_nth( GTK_LIST(list)->children, n );
+        if (child)
+        {
+            GtkBin *bin = GTK_BIN( child->data );
+            GtkLabel *label = GTK_LABEL( bin->child );
+            str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+        }
     }
 
     return str;
@@ -551,38 +712,71 @@ wxString wxComboBox::GetString( int n ) const
 
 wxString wxComboBox::GetStringSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
 
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
     {
-        GtkBin *bin = GTK_BIN( selection->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-#ifdef __WXGTK20__
-        wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
-        wxString tmp( label->label );
-#endif
-        return tmp;
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        int sel = gtk_combo_box_get_active( combobox );
+        if (sel == -1)
+            return wxEmptyString;
+        return GetString(sel);
     }
+    else
+#endif
+    {
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
 
-    wxFAIL_MSG( wxT("wxComboBox: no selection") );
+        GList *selection = GTK_LIST(list)->selection;
+        if (selection)
+        {
+            GtkBin *bin = GTK_BIN( selection->data );
+            GtkLabel *label = GTK_LABEL( bin->child );
+            wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+            return tmp;
+        }
+
+        wxFAIL_MSG( wxT("wxComboBox: no selection") );
+    }
 
-    return wxT("");
+    return wxEmptyString;
 }
 
-int wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const
 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+        GtkTreeIter iter;
+        gtk_tree_model_get_iter_first( model, &iter );
+        if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
+            return 0;
+        unsigned int ret = 1;
+        while (gtk_tree_model_iter_next( model, &iter ))
+            ret++;
+        return ret;
+    }
+    else
+#endif
+    {
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
 
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child) { count++; child = child->next; }
-    return count;
+        GList *child = GTK_LIST(list)->children;
+        unsigned int count = 0;
+        while (child)
+        {
+            count++;
+            child = child->next;
+        }
+        return count;
+    }
+
+    return 0;
 }
 
 void wxComboBox::SetSelection( int n )
@@ -591,27 +785,34 @@ void wxComboBox::SetSelection( int n )
 
     DisableEvents();
 
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );
-    gtk_list_select_item( GTK_LIST(list), n );
-    m_prevSelection = n;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+        gtk_combo_box_set_active( combobox, n );
+    }
+    else
+#endif
+    {
+        GtkWidget *list = GTK_COMBO(m_widget)->list;
+        gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );
+        gtk_list_select_item( GTK_LIST(list), n );
+        m_prevSelection = n;
+    }
 
     EnableEvents();
 }
 
-bool wxComboBox::SetStringSelection( const wxString &string )
-{
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") );
-
-    int res = FindString( string );
-    if (res == -1) return false;
-    SetSelection( res );
-    return true;
-}
-
 wxString wxComboBox::GetValue() const
 {
-    GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
     wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
 
 #if 0
@@ -630,10 +831,20 @@ void wxComboBox::SetValue( const wxString& value )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxT("");
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    wxString tmp;
     if (!value.IsNull()) tmp = value;
-    gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
+
+    DisableEvents();
+    gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
+    EnableEvents();
 
     InvalidateBestSize();
 }
@@ -642,24 +853,45 @@ void wxComboBox::Copy()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    gtk_editable_copy_clipboard(GTK_EDITABLE(entry));
 }
 
 void wxComboBox::Cut()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    gtk_editable_cut_clipboard(GTK_EDITABLE(entry));
 }
 
 void wxComboBox::Paste()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    gtk_editable_paste_clipboard(GTK_EDITABLE(entry));
 }
 
 void wxComboBox::Undo()
@@ -726,19 +958,41 @@ void wxComboBox::SetInsertionPoint( long pos )
     if ( pos == GetLastPosition() )
         pos = -1;
 
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    gtk_entry_set_position( entry, (int)pos );
 }
 
 long wxComboBox::GetInsertionPoint() const
 {
-    return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    return (long) gtk_editable_get_position(GTK_EDITABLE(entry));
 }
 
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
 {
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    int pos = entry->text_length;
     return (long) pos-1;
 }
 
@@ -746,45 +1000,71 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
     gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
     if (value.IsNull()) return;
     gint pos = (gint)to;
 
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = wxConvUTF8.cWX2MB( value );
-    gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos );
+    // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
+#if wxUSE_UNICODE_UTF8
+    const char *utf8 = value.utf8_str();
 #else
-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos );
+    wxCharBuffer buffer(value.utf8_str());
+    const char *utf8 = buffer;
 #endif
+    gtk_editable_insert_text(GTK_EDITABLE(entry), utf8, strlen(utf8), &pos);
 }
 
 void wxComboBox::SetSelection( long from, long to )
 {
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
     gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
 
 void wxComboBox::GetSelection( long* from, long* to ) const
 {
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
     if (IsEditable())
     {
-#ifdef __WXGTK20__
-        GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
+        GtkEditable *editable = GTK_EDITABLE(entry);
         gint start, end;
         gtk_editable_get_selection_bounds(editable, & start, & end);
         *from = start;
         *to = end;
-#else
-        *from = (long) editable->selection_start_pos;
-        *to = (long) editable->selection_end_pos;
-#endif
     }
 }
 
 void wxComboBox::SetEditable( bool editable )
 {
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
     gtk_entry_set_editable( GTK_ENTRY(entry), editable );
 }
 
@@ -793,12 +1073,12 @@ void wxComboBox::OnChar( wxKeyEvent &event )
     if ( event.GetKeyCode() == WXK_RETURN )
     {
         // GTK automatically selects an item if its in the list
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
-        event.SetString( GetValue() );
-        event.SetInt( GetSelection() );
-        event.SetEventObject( this );
+        wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());
+        eventEnter.SetString( GetValue() );
+        eventEnter.SetInt( GetSelection() );
+        eventEnter.SetEventObject( this );
 
-        if (!GetEventHandler()->ProcessEvent( event ))
+        if (!GetEventHandler()->ProcessEvent( eventEnter ))
         {
             // This will invoke the dialog default action, such
             // as the clicking the default button.
@@ -826,63 +1106,131 @@ void wxComboBox::OnChar( wxKeyEvent &event )
 
 void wxComboBox::DisableEvents()
 {
-    gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list),
-      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->entry),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
+
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtkcombobox_changed_callback, this);
+    }
+    else
+#endif
+    {
+        g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->list,
+            (gpointer) gtkcombo_combo_select_child_callback, this);
+
+        g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->entry,
+            (gpointer) gtkcombo_text_changed_callback, this);
+    }
 }
 
 void wxComboBox::EnableEvents()
 {
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
-      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
+
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtkcombobox_changed_callback, this);
+    }
+    else
+#endif
+    {
+        g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->list,
+            (gpointer) gtkcombo_combo_select_child_callback, this);
+
+        g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->entry,
+            (gpointer) gtkcombo_text_changed_callback, this);
+    }
 }
 
 void wxComboBox::OnSize( wxSizeEvent &event )
 {
-    // NB: In some situations (e.g. on non-first page of a wizard, if the
-    //     size used is default size), GtkCombo widget is resized correctly,
-    //     but it's look is not updated, it's rendered as if it was much wider.
-    //     No other widgets are affected, so it looks like a bug in GTK+.
-    //     Manually requesting resize calculation (as gtk_pizza_set_size does)
-    //     fixes it.
-    if (GTK_WIDGET_VISIBLE(m_widget))
-        gtk_widget_queue_resize(m_widget);
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        // Do nothing
+    }
+    else
+#endif
+    {
+        // NB: In some situations (e.g. on non-first page of a wizard, if the
+        //     size used is default size), GtkCombo widget is resized correctly,
+        //     but it's look is not updated, it's rendered as if it was much wider.
+        //     No other widgets are affected, so it looks like a bug in GTK+.
+        //     Manually requesting resize calculation (as gtk_pizza_set_size does)
+        //     fixes it.
+        if (GTK_WIDGET_VISIBLE(m_widget))
+            gtk_widget_queue_resize(m_widget);
+    }
 
     event.Skip();
 }
 
 void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        // Do nothing
+    }
+    else
+#endif
+    {
 //    gtk_widget_modify_style( GTK_COMBO(m_widget)->button, syle );
 
-    gtk_widget_modify_style( GTK_COMBO(m_widget)->entry, style );
-    gtk_widget_modify_style( GTK_COMBO(m_widget)->list, style );
+        gtk_widget_modify_style( GTK_COMBO(m_widget)->entry, style );
+        gtk_widget_modify_style( GTK_COMBO(m_widget)->list, style );
 
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_widget_modify_style( GTK_WIDGET(child->data), style );
+        GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+        GList *child = list->children;
+        while (child)
+        {
+            gtk_widget_modify_style( GTK_WIDGET(child->data), style );
 
-        GtkBin *bin = GTK_BIN(child->data);
-        gtk_widget_modify_style( bin->child, style );
+            GtkBin *bin = GTK_BIN(child->data);
+            gtk_widget_modify_style( bin->child, style );
 
-        child = child->next;
+            child = child->next;
+        }
     }
 }
 
 GtkWidget* wxComboBox::GetConnectWidget()
 {
-    return GTK_COMBO(m_widget)->entry;
+    GtkEntry *entry = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
+    else
+#endif
+        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+
+    return GTK_WIDGET( entry );
 }
 
-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-    return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
-             (window == GTK_COMBO(m_widget)->button->window ) );
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        wxUnusedVar(windows);
+
+        return GTK_ENTRY(GTK_BIN(m_widget)->child)->text_area;
+    }
+    else
+#endif // GTK+ 2.4
+    {
+        windows.push_back(GTK_ENTRY(GTK_COMBO(m_widget)->entry)->text_area);
+        windows.push_back(GTK_COMBO(m_widget)->button->window);
+
+        // indicate that we return multiple windows in the windows array
+        return NULL;
+    }
 }
 
 wxSize wxComboBox::DoGetBestSize() const
@@ -894,10 +1242,10 @@ wxSize wxComboBox::DoGetBestSize() const
     if ( m_widget )
     {
         int width;
-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
         {
-            GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
+            GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
             if ( width > ret.x )
                 ret.x = width;
         }
@@ -915,7 +1263,12 @@ wxSize wxComboBox::DoGetBestSize() const
 wxVisualAttributes
 wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true);
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);
+    else
+#endif
+        return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true);
 }
 
 // ----------------------------------------------------------------------------
@@ -996,4 +1349,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 }
 
 #endif
-