don't use deprecated wxMenuItem methods

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index fdb640143f81fe267f5e9ad5dc5c2ee216e35394..91207fc70a763bd145aba1b853685fbe186722c6 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -10,31 +10,25 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/combobox.h"
-

 #if wxUSE_COMBOBOX
 
 #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 use GtkCombo which has been deprecated since GTK+ 2.3.0
 // in favour of GtkComboBox for <GTK2.4 runtime

-#include <gtk/gtkversion.h>
-#if defined(GTK_DISABLE_DEPRECATED) && GTK_CHECK_VERSION(2,3,0)
+// We also use GtkList
+#ifdef GTK_DISABLE_DEPRECATED

 #undef GTK_DISABLE_DEPRECATED
 #endif
 #include "wx/gtk/private.h"
 
 #undef GTK_DISABLE_DEPRECATED
 #endif
 #include "wx/gtk/private.h"
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -51,8 +45,6 @@ extern "C" {
 static void
 gtkcombo_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 gtkcombo_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (combo->m_ignoreNextUpdate)
     {
         combo->m_ignoreNextUpdate = false;
     if (combo->m_ignoreNextUpdate)
     {
         combo->m_ignoreNextUpdate = false;


@@ -124,8 +116,6 @@ extern "C" {
 static void
 gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 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;
     if (!combo->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;


@@ -142,12 +132,12 @@ gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUS
     // Quickly set the value of the combo box
     // as GTK+ does that only AFTER the event
     // is sent.
     // Quickly set the value of the combo box
     // as GTK+ does that only AFTER the event
     // is sent.

-    g_signal_handlers_disconnect_by_func (GTK_COMBO (combo->GetHandle())->entry,
-                                          (gpointer) gtkcombo_text_changed_callback,
-                                          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() );
     combo->SetValue( combo->GetStringSelection() );

-    g_signal_connect_after (GTK_COMBO (combo->GetHandle())->entry, "changed",
-                            G_CALLBACK (gtkcombo_text_changed_callback), 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
 
     // 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


@@ -177,8 +167,6 @@ extern "C" {
 static void
 gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (!combo->m_hasVMT) return;
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
     if (!combo->m_hasVMT) return;
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );


@@ -192,10 +180,11 @@ extern "C" {
 static void
 gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (!combo->m_hasVMT) return;
 
     if (!combo->m_hasVMT) return;
 

+    if (combo->GetSelection() == -1)
+        return;
+

     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );


@@ -203,6 +192,7 @@ gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
     combo->GetEventHandler()->ProcessEvent( event );
 }
 }
     combo->GetEventHandler()->ProcessEvent( event );
 }
 }

+

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -251,9 +241,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          long style, const wxValidator& validator,
                          const wxString& name )
 {
                          long style, const wxValidator& validator,
                          const wxString& name )
 {

+    m_strings = NULL;

     m_ignoreNextUpdate = false;
     m_ignoreNextUpdate = false;

-    m_needParent = true;
-    m_acceptsFocus = true;

     m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||
     m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||


@@ -263,28 +252,22 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
         return false;
     }
 
         return false;
     }
 

+    if(HasFlag(wxCB_SORT))
+        m_strings = new wxSortedArrayString();
+

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         m_widget = gtk_combo_box_entry_new_text();
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         m_widget = gtk_combo_box_entry_new_text();

-        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-        
-        gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE );
-        
-        for (int i = 0; i < n; i++)
-        {
-            gtk_combo_box_append_text( combobox,  wxGTK_CONV( choices[i] ) );

 
 

-            m_clientDataList.Append( (wxObject*)NULL );
-            m_clientObjectList.Append( (wxObject*)NULL );
-        }
+        gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE );

     }
     else
 #endif
     {
         m_widget = gtk_combo_new();
         GtkCombo* combo = GTK_COMBO(m_widget);
     }
     else
 #endif
     {
         m_widget = gtk_combo_new();
         GtkCombo* combo = GTK_COMBO(m_widget);

-        
+

         // Disable GTK's broken events ...
         g_signal_handler_disconnect (combo->entry, combo->entry_change_id);
         // ... and add surrogate handler.
         // Disable GTK's broken events ...
         g_signal_handler_disconnect (combo->entry, combo->entry_change_id);
         // ... and add surrogate handler.


@@ -299,23 +282,10 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
         gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 
         if (style & wxNO_BORDER)
         gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 
         if (style & wxNO_BORDER)

-            g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
-            
-        GtkWidget *list = combo->list;
-
-        for (int i = 0; i < n; i++)
-        {
-            GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );
-
-            m_clientDataList.Append( (wxObject*)NULL );
-            m_clientObjectList.Append( (wxObject*)NULL );
-
-            gtk_container_add( GTK_CONTAINER(list), list_item );
-
-            gtk_widget_show( list_item );
-        }
+            g_object_set (combo->entry, "has-frame", FALSE, NULL );

     }
 
     }
 

+    Append(n, choices);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -324,9 +294,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     m_focusWidget = GTK_WIDGET( entry );
 
     PostCreation(size);
     m_focusWidget = GTK_WIDGET( entry );
 
     PostCreation(size);


@@ -342,15 +312,16 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     if (!gtk_check_version(2,4,0))
     {
         gtk_entry_set_text( entry, wxGTK_CONV(value) );
     if (!gtk_check_version(2,4,0))
     {
         gtk_entry_set_text( entry, wxGTK_CONV(value) );

-        
+

         if (style & wxCB_READONLY)
             gtk_entry_set_editable( entry, FALSE );
         if (style & wxCB_READONLY)
             gtk_entry_set_editable( entry, FALSE );

-            
+

         g_signal_connect_after (entry, "changed",
                             G_CALLBACK (gtkcombobox_text_changed_callback), this);
         g_signal_connect_after (entry, "changed",
                             G_CALLBACK (gtkcombobox_text_changed_callback), this);

-                            
+

         g_signal_connect_after (m_widget, "changed",
                             G_CALLBACK (gtkcombobox_changed_callback), this);
         g_signal_connect_after (m_widget, "changed",
                             G_CALLBACK (gtkcombobox_changed_callback), this);

+

     }
     else
 #endif
     }
     else
 #endif


@@ -374,31 +345,18 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                             this);
         g_signal_connect_after (entry, "changed",
                             G_CALLBACK (gtkcombo_text_changed_callback), this);
                             this);
         g_signal_connect_after (entry, "changed",
                             G_CALLBACK (gtkcombo_text_changed_callback), this);

-                            
-        // This is required for tool bar support
-        // Doesn't currently work
-//        wxSize setsize = GetSize();
-//        gtk_widget_set_size_request( m_widget, setsize.x, setsize.y );

     }
 
     }
 

-    SetBestSize(size); // need this too because this is a wxControlWithItems
-
+    SetInitialSize(size); // need this too because this is a wxControlWithItems

 
     return true;
 }
 
 wxComboBox::~wxComboBox()
 {
 
     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()
 }
 
 void wxComboBox::SetFocus()


@@ -412,15 +370,36 @@ void wxComboBox::SetFocus()
     gtk_widget_grab_focus( m_focusWidget );
 }
 
     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") );
 
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 

+    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+                 _T("In a sorted combobox data could only be appended"));
+
+    const int count = items.GetCount();
+
+    int n = wxNOT_FOUND;
+

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );

-        gtk_combo_box_append_text( combobox,  wxGTK_CONV( item ) );
+        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]);
+
+            gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );
+
+            m_clientData.Insert( NULL, n );
+            AssignNewItemClientData(n, clientData, i, type);
+        }

     }
     else
 #endif
     }
     else
 #endif


@@ -428,141 +407,54 @@ int wxComboBox::DoAppend( const wxString &item )
         DisableEvents();
 
         GtkWidget *list = GTK_COMBO(m_widget)->list;
         DisableEvents();
 
         GtkWidget *list = GTK_COMBO(m_widget)->list;

-        GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
-        gtk_container_add( GTK_CONTAINER(list), list_item );
-
-        if (GTK_WIDGET_REALIZED(m_widget))
+        for( int i = 0; i < count; ++i )

         {
         {

-            gtk_widget_realize( list_item );
-            gtk_widget_realize( GTK_BIN(list_item)->child );
-        }
-
-        // Apply current widget style to the new list_item
-        GtkRcStyle *style = CreateWidgetStyle();
-        if (style)
-        {
-            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 );
-
-        EnableEvents();
-    }
-    
-    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 );
-
-    InvalidateBestSize();
-
-    return count - 1;
-}
-
-int wxComboBox::DoInsert( const wxString &item, int pos )
-{
-    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
-                    wxT("can't insert into sorted list"));
-
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+            n = pos + i;
+            // If sorted, use this wxSortedArrayStrings to determine
+            // the right insertion point
+            if(m_strings)
+                n = m_strings->Add(items[i]);

 
 

-    int count = GetCount();
-    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+            GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( items[i] ) );

 
 

-    if (pos == count)
-        return Append(item);
+            // 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 );

 
 

-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-    {
-        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-        gtk_combo_box_insert_text( combobox, pos, wxGTK_CONV( item ) );
-    }
-    else
-#endif
-    {
-        DisableEvents();
+            m_clientData.Insert( NULL, n );
+            AssignNewItemClientData(n, clientData, i, type);

 
 

-        GtkWidget *list = GTK_COMBO(m_widget)->list;
-        GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
-        GList *gitem_list = g_list_alloc ();
-        gitem_list->data = list_item;
-        gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+            if (GTK_WIDGET_REALIZED(m_widget))
+            {
+                gtk_widget_realize( list_item );
+                gtk_widget_realize( GTK_BIN(list_item)->child );

 
 

-        if (GTK_WIDGET_REALIZED(m_widget))
-        {
-            gtk_widget_realize( list_item );
-            gtk_widget_realize( GTK_BIN(list_item)->child );
+                ApplyWidgetStyle();
+            }

 
 

-            ApplyWidgetStyle();
+            gtk_widget_show( list_item );

         }
 
         }
 

-        gtk_widget_show( list_item );
-

         EnableEvents();
     }
         EnableEvents();
     }

-    
-    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 );

 
     InvalidateBestSize();
 
 
     InvalidateBestSize();
 

-    return pos;
-}
-
-void wxComboBox::DoSetItemClientData( 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 );
+    return n;

 }
 
 }
 

-void* wxComboBox::DoGetItemClientData( int n ) const
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-
-    return node ? node->GetData() : NULL;
+    m_clientData[n] = clientData;

 }
 
 }
 

-void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
+void* wxComboBox::DoGetItemClientData(unsigned int n) const

 {
 {

-    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 );
+    return m_clientData[n];

 }
 
 }
 

-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") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 


@@ -572,42 +464,36 @@ void wxComboBox::Clear()
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );

-        int i;
-        for (i = 0; i++; i < GetCount())
+        const unsigned int count = GetCount();
+        for (unsigned int i = 0; i < count; i++)

             gtk_combo_box_remove_text( combobox, 0 );
     }
             gtk_combo_box_remove_text( combobox, 0 );
     }

-    else
-#endif
+    else // GTK+ < 2.4.0
+#endif // __WXGTK24__

     {
         GtkWidget *list = GTK_COMBO(m_widget)->list;
         gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
     }
     {
         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)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        node = node->GetNext();
-    }
-    m_clientObjectList.Clear();

 
 

-    m_clientDataList.Clear();
+    m_clientData.Clear();
+
+    if(m_strings)
+        m_strings->Clear();

 
     EnableEvents();
 
     InvalidateBestSize();
 }
 
 
     EnableEvents();
 
     InvalidateBestSize();
 }
 

-void wxComboBox::Delete( int n )
+void wxComboBox::DoDeleteOneItem(unsigned int n)

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        wxCHECK_RET( (n >= 0) && (n <= GetCount()), wxT("invalid index") );
-    
+        wxCHECK_RET( IsValid(n), wxT("invalid index") );
+

         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
         gtk_combo_box_remove_text( combobox, n );
     }
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
         gtk_combo_box_remove_text( combobox, n );
     }


@@ -632,23 +518,15 @@ void wxComboBox::Delete( int n )
 
         EnableEvents();
     }
 
         EnableEvents();
     }

-    
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        m_clientObjectList.Erase( node );
-    }

 
 

-    node = m_clientDataList.Item( n );
-    if (node)
-        m_clientDataList.Erase( node );
+    m_clientData.RemoveAt( n );
+    if(m_strings)
+        m_strings->RemoveAt( n );

 
     InvalidateBestSize();
 }
 
 
     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") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 


@@ -656,8 +534,8 @@ void wxComboBox::SetString(int n, const wxString &text)
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );

-        wxCHECK_RET( (n >= 0) && (n <= GetCount()), wxT("invalid index") );
-        
+        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))
         GtkTreeModel *model = gtk_combo_box_get_model( combobox );
         GtkTreeIter iter;
         if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))


@@ -686,7 +564,7 @@ void wxComboBox::SetString(int n, const wxString &text)
             wxFAIL_MSG( wxT("wxComboBox: wrong index") );
         }
     }
             wxFAIL_MSG( wxT("wxComboBox: wrong index") );
         }
     }

-    
+

     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }
 


@@ -704,18 +582,18 @@ int wxComboBox::FindString( const wxString &item, bool bCase ) const
         if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
             return -1;
         int count = 0;
         if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
             return -1;
         int count = 0;

-        do 
+        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 );
         {
             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;
             if (item.IsSameAs( str, bCase ) )
                 return count;

-                
+

             count++;
             count++;

-                
+

         } while (gtk_tree_model_iter_next( model, &iter ));
     }
     else
         } while (gtk_tree_model_iter_next( model, &iter ));
     }
     else


@@ -790,12 +668,12 @@ int wxComboBox::GetCurrentSelection() const
     return -1;
 }
 
     return -1;
 }
 

-wxString wxComboBox::GetString( int n ) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
     wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
 
     wxString str;
 {
     wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
 
     wxString str;

-    
+

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {


@@ -813,7 +691,7 @@ wxString wxComboBox::GetString( int n ) const
     }
     else
 #endif
     }
     else
 #endif

-    {    
+    {

         GtkWidget *list = GTK_COMBO(m_widget)->list;
 
         GList *child = g_list_nth( GTK_LIST(list)->children, n );
         GtkWidget *list = GTK_COMBO(m_widget)->list;
 
         GList *child = g_list_nth( GTK_LIST(list)->children, n );


@@ -843,11 +721,11 @@ wxString wxComboBox::GetStringSelection() const
         int sel = gtk_combo_box_get_active( combobox );
         if (sel == -1)
             return wxEmptyString;
         int sel = gtk_combo_box_get_active( combobox );
         if (sel == -1)
             return wxEmptyString;

-        return GetString( sel );
+        return GetString(sel);

     }
     else
 #endif
     }
     else
 #endif

-    {    
+    {

         GtkWidget *list = GTK_COMBO(m_widget)->list;
 
         GList *selection = GTK_LIST(list)->selection;
         GtkWidget *list = GTK_COMBO(m_widget)->list;
 
         GList *selection = GTK_LIST(list)->selection;


@@ -865,7 +743,7 @@ wxString wxComboBox::GetStringSelection() const
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-int wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const

 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 


@@ -878,22 +756,26 @@ int wxComboBox::GetCount() const
         gtk_tree_model_get_iter_first( model, &iter );
         if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
             return 0;
         gtk_tree_model_get_iter_first( model, &iter );
         if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
             return 0;

-        int ret = 1;
+        unsigned int ret = 1;

         while (gtk_tree_model_iter_next( model, &iter ))
             ret++;
         return ret;
     }
     else
 #endif
         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;
         GtkWidget *list = GTK_COMBO(m_widget)->list;
 
         GList *child = GTK_LIST(list)->children;

-        int count = 0;
-        while (child) { count++; child = child->next; }
+        unsigned int count = 0;
+        while (child)
+        {
+            count++;
+            child = child->next;
+        }

         return count;
     }
         return count;
     }

-    
+

     return 0;
 }
 
     return 0;
 }
 


@@ -917,7 +799,7 @@ void wxComboBox::SetSelection( int n )
         gtk_list_select_item( GTK_LIST(list), n );
         m_prevSelection = n;
     }
         gtk_list_select_item( GTK_LIST(list), n );
         m_prevSelection = n;
     }

-    
+

     EnableEvents();
 }
 
     EnableEvents();
 }
 


@@ -928,9 +810,9 @@ wxString wxComboBox::GetValue() const
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
 
 #if 0
     wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
 
 #if 0


@@ -954,12 +836,15 @@ void wxComboBox::SetValue( const wxString& value )
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     wxString tmp;
     if (!value.IsNull()) tmp = value;
     wxString tmp;
     if (!value.IsNull()) tmp = value;

+
+    DisableEvents();

     gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
     gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );

+    EnableEvents();

 
     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }


@@ -973,9 +858,9 @@ void wxComboBox::Copy()
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     gtk_editable_copy_clipboard(GTK_EDITABLE(entry));
 }
 
     gtk_editable_copy_clipboard(GTK_EDITABLE(entry));
 }
 


@@ -988,9 +873,9 @@ void wxComboBox::Cut()
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     gtk_editable_cut_clipboard(GTK_EDITABLE(entry));
 }
 
     gtk_editable_cut_clipboard(GTK_EDITABLE(entry));
 }
 


@@ -1003,9 +888,9 @@ void wxComboBox::Paste()
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     gtk_editable_paste_clipboard(GTK_EDITABLE(entry));
 }
 
     gtk_editable_paste_clipboard(GTK_EDITABLE(entry));
 }
 


@@ -1078,9 +963,9 @@ void wxComboBox::SetInsertionPoint( long pos )
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     gtk_entry_set_position( entry, (int)pos );
 }
 
     gtk_entry_set_position( entry, (int)pos );
 }
 


@@ -1091,9 +976,9 @@ long wxComboBox::GetInsertionPoint() const
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     return (long) gtk_editable_get_position(GTK_EDITABLE(entry));
 }
 
     return (long) gtk_editable_get_position(GTK_EDITABLE(entry));
 }
 


@@ -1104,9 +989,9 @@ wxTextPos wxComboBox::GetLastPosition() const
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     int pos = entry->text_length;
     return (long) pos-1;
 }
     int pos = entry->text_length;
     return (long) pos-1;
 }


@@ -1120,19 +1005,21 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         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;
 
     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
 #else

-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos );
+    wxCharBuffer buffer(value.utf8_str());
+    const char *utf8 = buffer;

 #endif
 #endif

+    gtk_editable_insert_text(GTK_EDITABLE(entry), utf8, strlen(utf8), &pos);

 }
 
 void wxComboBox::SetSelection( long from, long to )
 }
 
 void wxComboBox::SetSelection( long from, long to )


@@ -1142,9 +1029,9 @@ void wxComboBox::SetSelection( long from, long to )
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
 
     gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
 


@@ -1155,9 +1042,9 @@ void wxComboBox::GetSelection( long* from, long* to ) const
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     if (IsEditable())
     {
         GtkEditable *editable = GTK_EDITABLE(entry);
     if (IsEditable())
     {
         GtkEditable *editable = GTK_EDITABLE(entry);


@@ -1175,9 +1062,9 @@ void wxComboBox::SetEditable( bool editable )
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     gtk_entry_set_editable( GTK_ENTRY(entry), editable );
 }
 
     gtk_entry_set_editable( GTK_ENTRY(entry), editable );
 }
 


@@ -1222,20 +1109,20 @@ void wxComboBox::DisableEvents()
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        g_signal_handlers_disconnect_by_func (GTK_BIN(m_widget)->child, 
-                (gpointer)gtkcombobox_text_changed_callback, this);
-                            
-        g_signal_handlers_disconnect_by_func (m_widget,
-                (gpointer)gtkcombobox_changed_callback, this);
+        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
     }
     else

-#endif    
+#endif

     {
     {

-        g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->list,
-                (gpointer) gtkcombo_combo_select_child_callback, this);
-                
-        g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->entry,
-                (gpointer) gtkcombo_text_changed_callback, this);
+        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);

     }
 }
 
     }
 }
 


@@ -1244,21 +1131,20 @@ void wxComboBox::EnableEvents()
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        g_signal_connect_after (GTK_BIN(m_widget)->child, "changed",
-                            G_CALLBACK (gtkcombobox_text_changed_callback), this);
-                            
-        g_signal_connect_after (m_widget, "changed",
-                            G_CALLBACK (gtkcombobox_changed_callback), this);
+        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
     }
     else

-#endif    
+#endif

     {
     {

-        g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child",
-                            G_CALLBACK (gtkcombo_combo_select_child_callback),
-                            this);
-        g_signal_connect_after (GTK_COMBO(m_widget)->entry, "changed",
-                            G_CALLBACK (gtkcombo_text_changed_callback),
-                            this );
+        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);

     }
 }
 
     }
 }
 


@@ -1321,27 +1207,29 @@ GtkWidget* wxComboBox::GetConnectWidget()
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else
     if (!gtk_check_version(2,4,0))
         entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
     else

-#endif    
+#endif

         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );

-        
+

     return GTK_WIDGET( entry );
 }
 
     return GTK_WIDGET( entry );
 }
 

-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    GtkEntry *entry = NULL;

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
-        return (window == entry->text_area);
+        wxUnusedVar(windows);
+
+        return GTK_ENTRY(GTK_BIN(m_widget)->child)->text_area;

     }
     else
     }
     else

-#endif    
+#endif // GTK+ 2.4

     {
     {

-        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-        return ( (window == entry->text_area) ||
-                 (window == GTK_COMBO(m_widget)->button->window ) );
+        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;

     }
 }
 
     }
 }
 


@@ -1354,10 +1242,10 @@ wxSize wxComboBox::DoGetBestSize() const
     if ( m_widget )
     {
         int width;
     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;
         }
             if ( width > ret.x )
                 ret.x = width;
         }