X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/gtk1/combobox.cpp?ds=sidebyside

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 4bcce99f9f..ea3d169aac 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -1,367 +1,1034 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/gtk1/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
-#include <wx/intl.h>
+
+#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
+
+#include "wx/gtk1/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
 
 //-----------------------------------------------------------------------------
-// wxComboBox
+//  "changed" - typing and list item matches get changed, select-child
+//              if it doesn't match an item then just get a single changed
 //-----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// clicked
+extern "C" {
+static void
+gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
 
-static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+    if (combo->m_ignoreNextUpdate)
+    {
+        combo->m_ignoreNextUpdate = false;
+        return;
+    }
+
+    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
+gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+{
+}
+}
+
+extern "C" {
+static void
+gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
 {
-  if (!combo->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  if (combo->m_alreadySent)
-  {
-    combo->m_alreadySent = FALSE;
-    return;
-  }
+    // 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;
 
-  combo->m_alreadySent = TRUE;
-  
-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
-  event.SetInt( combo->GetSelection() );
-  wxString tmp( combo->GetStringSelection() );
-  event.SetString( WXSTRINGCAST(tmp) );
-  event.SetEventObject(combo);
-  combo->GetEventHandler()->ProcessEvent(event);
+    // 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_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{
+    // store the combobox selection value before the popup is shown
+    g_SelectionBeforePopup = combo->GetCurrentSelection();
+}
 }
 
 //-----------------------------------------------------------------------------
-// size 
-
-/*
-static gint gtk_combo_size_callback( GtkCombo *widget, GtkAllocation* alloc, wxComboBox *win )
-{ 
-  if (!win->HasVMT()) return FALSE;
-  if (g_blockEventsOnDrag) return FALSE;
-  if (!widget->button) return FALSE;
-  
-  widget->button->allocation.x = 
-    alloc->width - widget->button->allocation.width;
-  
-  return FALSE;
-}
-*/
+// "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 )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
 
+    if (!combo->m_hasVMT) return;
+
+    if (g_blockEventsOnDrag) return;
+
+    int curSelection = combo->GetCurrentSelection();
+
+    if (combo->m_prevSelection == curSelection) return;
+
+    GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
+    gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
+
+    combo->m_prevSelection = curSelection;
+
+    // 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 );
+    combo->SetValue( combo->GetStringSelection() );
+    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
+
+    // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE)
+    // because when combobox popup is shown, gtk_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 );
+    }
+}
+}
+
+//-----------------------------------------------------------------------------
+// wxComboBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 
-bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
-  const wxPoint& pos, const wxSize& size,
-  int n, const wxString choices[],
-  long style, const wxValidator& validator, const wxString& name )
-{
-  m_alreadySent = FALSE;
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
-
-  m_widget = gtk_combo_new();
-  
-  wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = 100;
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  for (int i = 0; i < n; i++)
-  {
-    GtkWidget *list_item;
-    list_item = gtk_list_item_new_with_label( choices[i] ); 
-  
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+    EVT_SIZE(wxComboBox::OnSize)
+    EVT_CHAR(wxComboBox::OnChar)
+
+    EVT_MENU(wxID_CUT, wxComboBox::OnCut)
+    EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
+    EVT_MENU(wxID_PASTE, wxComboBox::OnPaste)
+    EVT_MENU(wxID_UNDO, wxComboBox::OnUndo)
+    EVT_MENU(wxID_REDO, wxComboBox::OnRedo)
+    EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete)
+    EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll)
+
+    EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut)
+    EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy)
+    EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste)
+    EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
+    EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
+    EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
+END_EVENT_TABLE()
+
+bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& value,
+                         const wxPoint& pos, const wxSize& size,
+                         const wxArrayString& choices,
+                         long style, const wxValidator& validator,
+                         const wxString& name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
+
+bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
+                         const wxPoint& pos, const wxSize& size,
+                         int n, const wxString choices[],
+                         long style, const wxValidator& validator,
+                         const wxString& name )
+{
+    m_ignoreNextUpdate = false;
+    m_needParent = true;
+    m_acceptsFocus = true;
+    m_prevSelection = 0;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxComboBox creation failed") );
+        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 surrogate 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 );
+
+    // and case-sensitive
+    gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+
+    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 );
+    }
+
+    m_parent->DoAddChild( this );
+
+    m_focusWidget = combo->entry;
+
+    PostCreation(size);
+
+    ConnectWidget( combo->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) );
+
+    if (style & wxCB_READONLY)
+        gtk_entry_set_editable( GTK_ENTRY( combo->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
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "hide",
+                        GTK_SIGNAL_FUNC(gtk_popup_hide_callback), (gpointer)this );
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
+                        GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this );
+
+    gtk_signal_connect_after( GTK_OBJECT(combo->entry), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
+
+    gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child",
+      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
+
+    SetBestSize(size); // need this too because this is a wxControlWithItems
+
+    // This is required for tool bar support
+//    wxSize setsize = GetSize();
+//    gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
+
+    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();
+
+    m_clientDataList.Clear();
+}
+
+void wxComboBox::SetFocus()
+{
+    if ( m_hasFocus )
+    {
+        // don't do anything if we already have focus
+        return;
+    }
+
+    gtk_widget_grab_focus( m_focusWidget );
+}
+
+int wxComboBox::DoAppend( const wxString &item )
+{
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+
+    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 );
-    
-    m_clientData.Append( (wxObject*)NULL );
-    
+
+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        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 );
-    
-    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-  }
-  
-  PostCreation();
 
-/*
-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
-    GTK_SIGNAL_FUNC(gtk_combo_size_callback), (gpointer)this );
-*/
-
-  if (!value.IsNull()) SetValue( value );
-    
-  Show( TRUE );
-    
-  return TRUE;
-}
-
-void wxComboBox::Clear(void)
-{
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-  
-  m_clientData.Clear();
-}
-
-void wxComboBox::Append( const wxString &item )
-{
-  Append( item, (char*)NULL );
-}
-
-void wxComboBox::Append( const wxString &item, char *clientData )
-{
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GtkWidget *list_item;
-  list_item = gtk_list_item_new_with_label( item ); 
-  
-  gtk_signal_connect( GTK_OBJECT(list_item), "select", 
-    GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-  
-  gtk_container_add( GTK_CONTAINER(list), list_item );
-    
-  gtk_widget_show( list_item );
-  
-  m_clientData.Append( (wxObject*)clientData );
-}
-
-void wxComboBox::Delete( int n )
-{
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_clear_items( GTK_LIST(list), n, n );
-  
-  wxNode *node = m_clientData.Nth( n );
-  if (!node)
-  {
-    wxFAIL_MSG( "wxComboBox: wrong index" );
-  }
-  else
-    m_clientData.DeleteNode( node );
-}
-
-int wxComboBox::FindString( const wxString &item )
-{
-  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 );
-    if (item == label->label) return count;
-    count++;
-    child = child->next;
-  }
-  
-  wxFAIL_MSG( "wxComboBox: string not found" );
-  
-  return -1;
-}
-
-char* wxComboBox::GetClientData( int n )
-{
-  wxNode *node = m_clientData.Nth( n );
-  if (node) return (char*)node->Data();
-  
-  wxFAIL_MSG( "wxComboBox: wrong index" );
-  
-  return (char *) NULL;
-}
-
-void wxComboBox::SetClientData( int n, char * clientData )
-{
-  wxNode *node = m_clientData.Nth( n );
-  if (node) node->SetData( (wxObject*) clientData );
-  
-  wxFAIL_MSG( "wxComboBox: wrong index" );
-}
-
-int wxComboBox::GetSelection(void) const
+    const unsigned int count = GetCount();
+
+    if ( m_clientDataList.GetCount() < count )
+        m_clientDataList.Append( (wxObject*) NULL );
+    if ( m_clientObjectList.GetCount() < count )
+        m_clientObjectList.Append( (wxObject*) NULL );
+
+    EnableEvents();
+
+    InvalidateBestSize();
+
+    return count - 1;
+}
+
+int wxComboBox::DoInsert( const wxString &item, unsigned int pos )
+{
+    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
+                    wxT("can't insert into sorted list"));
+
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+
+    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") );
+
+    if (pos == GetCount())
+        return Append(item);
+
+    DisableEvents();
+
+    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 );
+
+        ApplyWidgetStyle();
+    }
+
+    gtk_widget_show( list_item );
+
+    const unsigned int count = GetCount();
+
+    if ( m_clientDataList.GetCount() < count )
+        m_clientDataList.Insert( pos, (wxObject*) NULL );
+    if ( m_clientObjectList.GetCount() < count )
+        m_clientObjectList.Insert( pos, (wxObject*) NULL );
+
+    EnableEvents();
+
+    InvalidateBestSize();
+
+    return pos;
+}
+
+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 );
+}
+
+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;
+}
+
+void wxComboBox::DoSetItemClientObject(unsigned 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(unsigned 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()
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GList *selection = GTK_LIST(list)->selection;
-  if (selection)
-  {
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+    DisableEvents();
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    gtk_list_clear_items( GTK_LIST(list), 0, (int)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();
+
+    EnableEvents();
+
+    InvalidateBestSize();
+}
+
+void wxComboBox::Delete(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)
+    {
+        wxFAIL_MSG(wxT("wrong index"));
+        return;
+    }
+
+    DisableEvents();
+
+    GList *list = g_list_append( (GList*) NULL, child->data );
+    gtk_list_remove_items( listbox, list );
+    g_list_free( list );
+
+    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 );
+
+    EnableEvents();
+
+    InvalidateBestSize();
+}
+
+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)
+    {
+        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, bool bCase ) const
+{
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
     GList *child = GTK_LIST(list)->children;
     int count = 0;
     while (child)
     {
-      if (child->data == selection->data) return count;
-      count++;
-      child = child->next;
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkLabel *label = GTK_LABEL( bin->child );
+        wxString str( label->label );
+        if (item.IsSameAs( str , bCase ) )
+            return count;
+
+        count++;
+        child = child->next;
     }
-  }
-  
-  wxFAIL_MSG( "wxComboBox: no selection" );
-  
-  return -1;
-}
-
-wxString wxComboBox::GetString( int n ) const
-{
-  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 );
-    return label->label;
-  }
-  
-  wxFAIL_MSG( "wxComboBox: wrong index" );
-  
-  return "";
-}
-
-wxString wxComboBox::GetStringSelection(void) const
-{
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GList *selection = GTK_LIST(list)->selection;
-  if (selection)
-  {
-    GtkBin *bin = GTK_BIN( selection->data );
-    wxString tmp = GTK_LABEL( bin->child )->label;
-    return tmp;
-  }
-  
-  wxFAIL_MSG( "wxComboBox: no selection" );
-  
-  return "";
+
+    return wxNOT_FOUND;
 }
 
-int wxComboBox::Number(void) const
+int wxComboBox::GetSelection() const
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GList *child = GTK_LIST(list)->children;
-  int count = 0;
-  while (child) { count++; child = child->next; }
-  return count;
+    // 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;
 }
 
-void wxComboBox::SetSelection( int n )
+int wxComboBox::GetCurrentSelection() const
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_select_item( GTK_LIST(list), n );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    GList *selection = GTK_LIST(list)->selection;
+    if (selection)
+    {
+        GList *child = GTK_LIST(list)->children;
+        int count = 0;
+        while (child)
+        {
+            if (child->data == selection->data) return count;
+            count++;
+            child = child->next;
+        }
+    }
+
+    return wxNOT_FOUND;
 }
 
-void wxComboBox::SetStringSelection( const wxString &string )
+wxString wxComboBox::GetString(unsigned int n) const
 {
-  int res = FindString( string );
-  if (res == -1) return;
-  SetSelection( res );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    wxString str;
+    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 = wxString( label->label );
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+    }
+
+    return str;
+}
+
+wxString wxComboBox::GetStringSelection() const
+{
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    GList *selection = GTK_LIST(list)->selection;
+    if (selection)
+    {
+        GtkBin *bin = GTK_BIN( selection->data );
+        GtkLabel *label = GTK_LABEL( bin->child );
+        wxString tmp( label->label );
+        return tmp;
+    }
+
+    wxFAIL_MSG( wxT("wxComboBox: no selection") );
+
+    return wxEmptyString;
+}
+
+unsigned int wxComboBox::GetCount() const
+{
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    GList *child = GTK_LIST(list)->children;
+    unsigned int count = 0;
+    while (child) { count++; child = child->next; }
+    return count;
+}
+
+void wxComboBox::SetSelection( int n )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+    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;
+
+    EnableEvents();
 }
 
-wxString wxComboBox::GetValue(void) const
+wxString wxComboBox::GetValue() const
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
-  return tmp;
+    GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+    wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
+
+#if 0
+    for (int i = 0; i < wxStrlen(tmp.c_str()) +1; i++)
+    {
+        wxChar c = tmp[i];
+        printf( "%d ", (int) (c) );
+    }
+    printf( "\n" );
+#endif
+
+    return tmp;
 }
 
 void wxComboBox::SetValue( const wxString& value )
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  wxString tmp = "";
-  if (!value.IsNull()) tmp = value;
-  gtk_entry_set_text( GTK_ENTRY(entry), tmp );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    wxString tmp;
+    if (!value.IsNull()) tmp = value;
+    gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
+
+    InvalidateBestSize();
+}
+
+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 );
 }
 
-void wxComboBox::Copy(void)
+void wxComboBox::Cut()
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
+    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 );
 }
 
-void wxComboBox::Cut(void)
+void wxComboBox::Paste()
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
+    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);
 }
 
-void wxComboBox::Paste(void)
+void wxComboBox::Undo()
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
+    // TODO
 }
 
-void wxComboBox::SetInsertionPoint( long pos )
+void wxComboBox::Redo()
+{
+    // TODO
+}
+
+void wxComboBox::SelectAll()
+{
+    SetSelection(0, GetLastPosition());
+}
+
+bool wxComboBox::CanUndo() const
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int tmp = (int) pos;
-  gtk_entry_set_position( GTK_ENTRY(entry), tmp );
+    // TODO
+    return false;
 }
 
-void wxComboBox::SetInsertionPointEnd(void)
+bool wxComboBox::CanRedo() const
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int pos = GTK_ENTRY(entry)->text_length;
-  SetInsertionPoint( pos-1 );
+    // TODO
+    return false;
 }
 
-long wxComboBox::GetInsertionPoint(void) const
+bool wxComboBox::HasSelection() const
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  return (long) GTK_EDITABLE(entry)->current_pos;
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;
 }
 
-long wxComboBox::GetLastPosition(void) const
+bool wxComboBox::CanCopy() const
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int pos = GTK_ENTRY(entry)->text_length;
-  return (long) pos-1;
+    // Can copy if there's a selection
+    return HasSelection();
+}
+
+bool wxComboBox::CanCut() const
+{
+    return CanCopy() && IsEditable();
+}
+
+bool wxComboBox::CanPaste() const
+{
+    // TODO: check for text on the clipboard
+    return IsEditable() ;
+}
+
+bool wxComboBox::IsEditable() const
+{
+    return !HasFlag(wxCB_READONLY);
+}
+
+
+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 );
+}
+
+long wxComboBox::GetInsertionPoint() const
+{
+    return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
+}
+
+wxTextPos wxComboBox::GetLastPosition() const
+{
+    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    int pos = GTK_ENTRY(entry)->text_length;
+    return (long) pos-1;
 }
 
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
-  GtkWidget *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_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
+    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 );
+    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 );
+#else
+    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.length(), &pos );
+#endif
+}
+
+void wxComboBox::SetSelection( long from, long to )
+{
+    GtkWidget *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
+{
+    if (IsEditable())
+    {
+        GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
+        *from = (long) editable->selection_start_pos;
+        *to = (long) editable->selection_end_pos;
+    }
+}
+
+void wxComboBox::SetEditable( bool editable )
+{
+    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
+}
+
+void wxComboBox::OnChar( wxKeyEvent &event )
+{
+    if ( event.GetKeyCode() == WXK_RETURN )
+    {
+        // GTK automatically selects an item if its in the list
+        wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());
+        eventEnter.SetString( GetValue() );
+        eventEnter.SetInt( GetSelection() );
+        eventEnter.SetEventObject( this );
+
+        if (!GetEventHandler()->ProcessEvent( eventEnter ))
+        {
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.
+
+            wxWindow *top_frame = m_parent;
+            while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+                top_frame = top_frame->GetParent();
+
+            if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+            {
+                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+                if (window->default_widget)
+                        gtk_widget_activate (window->default_widget);
+            }
+        }
+
+        // Catch GTK event so that GTK doesn't open the drop
+        // down list upon RETURN.
+        return;
+    }
+
+    event.Skip();
+}
+
+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 );
+}
+
+void wxComboBox::EnableEvents()
+{
+    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
+      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
+    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)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);
+
+    event.Skip();
+}
+
+void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+//    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 );
+
+    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 );
+
+        child = child->next;
+    }
+}
+
+GtkWidget* wxComboBox::GetConnectWidget()
+{
+    return GTK_COMBO(m_widget)->entry;
+}
+
+bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+{
+    return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
+             (window == GTK_COMBO(m_widget)->button->window ) );
+}
+
+wxSize wxComboBox::DoGetBestSize() const
+{
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    // we know better our horizontal extent: it depends on the longest string
+    // in the combobox
+    if ( m_widget )
+    {
+        int width;
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
+        {
+            GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
+            if ( width > ret.x )
+                ret.x = width;
+        }
+    }
+
+    // empty combobox should have some reasonable default size too
+    if ( ret.x < 100 )
+        ret.x = 100;
+
+    CacheBestSize(ret);
+    return ret;
+}
+
+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true);
 }
 
-void wxComboBox::Remove(long from, long to)
+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------
+
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))
+{
+    Cut();
+}
+
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+    Copy();
+}
+
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+    Paste();
+}
+
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
+    Undo();
 }
 
-void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
 {
+    Redo();
 }
 
-void wxComboBox::SetEditable( bool WXUNUSED(editable) )
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
+    long from, to;
+    GetSelection(& from, & to);
+    if (from != -1 && to != -1)
+        Remove(from, to);
 }
 
-      
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
+{
+    SetSelection(-1, -1);
+}
+
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
+{
+    event.Enable( CanCut() );
+}
+
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)
+{
+    event.Enable( CanCopy() );
+}
+
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)
+{
+    event.Enable( CanPaste() );
+}
+
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanUndo() );
+}
+
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanRedo() );
+}
+
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
+{
+    event.Enable(HasSelection() && IsEditable()) ;
+}
+
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+    event.Enable(GetLastPosition() > 0);
+}
+
+#endif