revert updating GTK size hints when window decorations change, it messes up min size...

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 55cbde698363aeec9f4c5ec70f13234b958376e5..439408958bd89fb940c0b6692cfec3bf37dc9a86 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,88 +7,52 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
-
-#include "wx/combobox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-#include "wx/settings.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

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "select"
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------

 
 

+extern "C" {

 static void
 static void

-gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtkcombobox_text_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 (g_blockEventsOnDrag) return;
-
-    if (combo->m_alreadySent)
-    {
-        combo->m_alreadySent = FALSE;
-        return;
-    }
-
-    combo->m_alreadySent = TRUE;
-
-    int curSelection = combo->GetSelection();
-
-    if (combo->m_prevSelection != curSelection)
-    {
-        GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
-        gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
-    }
-
-    combo->m_prevSelection = curSelection;
-
-    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( curSelection );
-    event.SetString( combo->GetStringSelection() );
+    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+    event.SetString( combo->GetValue() );

     event.SetEventObject( combo );
     event.SetEventObject( combo );

-
-    combo->GetEventHandler()->ProcessEvent( event );
+    combo->HandleWindowEvent( event );

 }
 
 }
 

-//-----------------------------------------------------------------------------
-//  "changed"
-//-----------------------------------------------------------------------------
-

 static void
 static void

-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+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;
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-    event.SetString( combo->GetValue() );
+    if (combo->GetSelection() == -1)
+        return;
+
+    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+    event.SetInt( combo->GetSelection() );
+    event.SetString( combo->GetStringSelection() );

     event.SetEventObject( combo );
     event.SetEventObject( combo );

-    combo->GetEventHandler()->ProcessEvent( event );
+    combo->HandleWindowEvent( event );
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -98,352 +62,303 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)

-    EVT_SIZE(wxComboBox::OnSize)

     EVT_CHAR(wxComboBox::OnChar)
     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()
 
 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 )
 {
 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;
-    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") );
     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();
-
-    // 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 );
-
+    if (HasFlag(wxCB_SORT))
+        m_strings = new wxSortedArrayString();

 
 

-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    m_widget = gtk_combo_box_entry_new_text();

 
 

-    gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
-
-    for (int i = 0; i < n; i++)
+    if (HasFlag(wxBORDER_NONE))

     {
     {

-        /* don't send first event, which GTK sends aways when
-           inserting the first item */
-        m_alreadySent = TRUE;
-
-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
+        // Doesn't seem to work
+        // g_object_set (m_widget, "has-frame", FALSE, NULL);
+    }

 
 

-        m_clientDataList.Append( (wxObject*)NULL );
-        m_clientObjectList.Append( (wxObject*)NULL );
+    GtkEntry * const entry = GetEntry();

 
 

-        gtk_container_add( GTK_CONTAINER(list), list_item );
+    gtk_entry_set_editable( entry, TRUE );

 
 

-        gtk_signal_connect( GTK_OBJECT(list_item), "select",
-           GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        gtk_widget_show( list_item );
-    }
+    Append(n, choices);

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

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

 
 

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

 
 

-    ConnectWidget( GTK_COMBO(m_widget)->button );
+    ConnectWidget( m_widget );

 
 

-    if (!value.IsNull()) SetValue( value );
+    gtk_entry_set_text( entry, wxGTK_CONV(value) );

 
     if (style & wxCB_READONLY)
 
     if (style & wxCB_READONLY)

-        gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
-
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if (new_size.y > size_best.y)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-    {
-        SetSize( new_size.x, new_size.y );
-        
-        // This is required for tool bar support
-        gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
-    }
+        gtk_entry_set_editable( entry, FALSE );
+
+    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);

 
 

-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );

 
 

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

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-wxComboBox::~wxComboBox()
+GtkEntry *wxComboBox::GetEntry() const

 {
 {

-    wxNode *node = m_clientObjectList.First();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
+    return GTK_ENTRY(GTK_BIN(m_widget)->child);

 }
 
 }
 

-void wxComboBox::AppendCommon( const wxString &item )
+GtkEditable *wxComboBox::GetEditable() const

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
+    return GTK_EDITABLE( GTK_BIN(m_widget)->child );
+}

 
 

-    gtk_container_add( GTK_CONTAINER(list), list_item );
+wxComboBox::~wxComboBox()
+{
+    Clear();

 
 

-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+    delete m_strings;
+}

 
 

-    if (GTK_WIDGET_REALIZED(m_widget))
+void wxComboBox::SetFocus()
+{
+    if ( m_hasFocus )

     {
     {

-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
-
-        if (m_widgetStyle) ApplyWidgetStyle();
+        // don't do anything if we already have focus
+        return;

     }
 
     }
 

-    gtk_widget_show( list_item );
+    gtk_widget_grab_focus( m_focusWidget );

 }
 
 }
 

-void wxComboBox::Append( const wxString &item )
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type)

 {
 {

-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );

 
 

-    AppendCommon( item );
-}
+    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+                 _T("In a sorted combobox data could only be appended"));

 
 

-void wxComboBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
+    const int count = items.GetCount();

 
 

-    AppendCommon( item );
-}
+    int n = wxNOT_FOUND;

 
 

-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
+    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]);

 
 

-    AppendCommon( item );
-}
+        gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );

 
 

-void wxComboBox::SetClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+        m_clientData.Insert( NULL, n );
+        AssignNewItemClientData(n, clientData, i, type);
+    }

 
 

-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
+    InvalidateBestSize();

 
 

-    node->SetData( (wxObject*) clientData );
+    return n;

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
+    m_clientData[n] = clientData;
+}

 
 

-    return node->Data();
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
+{
+    return m_clientData[n];

 }
 
 }
 

-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
+void wxComboBox::DoClear()

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

-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
+    DisableEvents();

 
 

-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
+    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 );

 
 

-    node->SetData( (wxObject*) clientData );
-}
+    m_clientData.Clear();

 
 

-wxClientData* wxComboBox::GetClientObject( int n )
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
+    if(m_strings)
+        m_strings->Clear();

 
 

-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
+    EnableEvents();

 
 

-    return (wxClientData*) node->Data();
+    InvalidateBestSize();

 }
 
 }
 

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

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

-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+    wxCHECK_RET( IsValid(n), wxT("invalid index") );

 
 

-    wxNode *node = m_clientObjectList.First();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    gtk_combo_box_remove_text( combobox, n );
+
+    m_clientData.RemoveAt( n );
+    if(m_strings)
+        m_strings->RemoveAt( n );

 
 

-    m_clientDataList.Clear();
+    InvalidateBestSize();

 }
 
 }
 

-void wxComboBox::Delete( int n )
+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") );
 

-    GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    wxCHECK_RET( IsValid(n), wxT("invalid index") );

 
 

-    GList *child = g_list_nth( listbox->children, n );
-
-    if (!child)
+    GtkTreeModel *model = gtk_combo_box_get_model( combobox );
+    GtkTreeIter iter;
+    if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))

     {
     {

-        wxFAIL_MSG(wxT("wrong index"));
-        return;
+        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 );

     }
 
     }
 

-    GList *list = g_list_append( (GList*) NULL, child->data );
-    gtk_list_remove_items( listbox, list );
-    g_list_free( list );
-
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        m_clientObjectList.DeleteNode( node );
-    }
-
-    node = m_clientDataList.Nth( n );
-    if (node)
-    {
-        m_clientDataList.DeleteNode( node );
-    }
+    InvalidateBestSize();

 }
 
 }
 

-int wxComboBox::FindString( const wxString &item )
+int wxComboBox::FindString( const wxString &item, bool bCase ) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );

 
 

-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
+    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;
     int count = 0;

-    while (child)
+    do

     {
     {

-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        if (item == wxString(label->label,*wxConvCurrent))
+        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;
             return count;

+

         count++;
         count++;

-        child = child->next;

     }
     }

+    while ( gtk_tree_model_iter_next(model, &iter) );

 
     return wxNOT_FOUND;
 }
 
 int wxComboBox::GetSelection() const
 {
 
     return wxNOT_FOUND;
 }
 
 int wxComboBox::GetSelection() const
 {

-    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 -1;
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    return gtk_combo_box_get_active( combobox );

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxT(""), 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,*wxConvCurrent);
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
-    }
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );

 
 

-    return str;
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    return gtk_combo_box_get_active( combobox );

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );

 
 

-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    wxString str;

 
 

-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
+    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))

     {
     {

-        GtkBin *bin = GTK_BIN( selection->data );
-        wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
+        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;
     }
 
         return tmp;
     }
 

-    wxFAIL_MSG( wxT("wxComboBox: no selection") );
-
-    return wxT("");
+    return str;

 }
 
 }
 

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

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

-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child) { count++; child = child->next; }
-    return count;
+    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;

 }
 
 void wxComboBox::SetSelection( int n )
 }
 
 void wxComboBox::SetSelection( int n )


@@ -452,277 +367,187 @@ void wxComboBox::SetSelection( int n )
 
     DisableEvents();
 
 
     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;
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    gtk_combo_box_set_active( combobox, n );

 
     EnableEvents();
 }
 
 
     EnableEvents();
 }
 

-void wxComboBox::SetStringSelection( const wxString &string )
+void wxComboBox::OnChar( wxKeyEvent &event )

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    switch ( event.GetKeyCode() )
+    {
+        case WXK_RETURN:
+            if ( HasFlag(wxTE_PROCESS_ENTER) )
+            {
+                // 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 );

 
 

-    int res = FindString( string );
-    if (res == -1) return;
-    SetSelection( res );
-}
+                if ( HandleWindowEvent(eventEnter) )
+                {
+                    // Catch GTK event so that GTK doesn't open the drop
+                    // down list upon RETURN.
+                    return;
+                }
+            }

 
 

-wxString wxComboBox::GetValue() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
-    return tmp;
+            // On enter key press, we must give a signal to default control, 
+            // Otherwise, nothing happens when pressing Enter from inside a 
+            // combo box in a dialog. 
+            wxWindow *top_frame = wxGetTopLevelParent(this);
+            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 );
+            }
+            break;
+    }
+
+    event.Skip();

 }
 
 }
 

-void wxComboBox::SetValue( const wxString& value )
+void wxComboBox::DisableEvents()

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+        (gpointer)gtkcombobox_text_changed_callback, this);

 
 

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxT("");
-    if (!value.IsNull()) tmp = value;
-    gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );
+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtkcombobox_changed_callback, this);

 }
 
 }
 

-void wxComboBox::Copy()
+void wxComboBox::EnableEvents()

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+        (gpointer)gtkcombobox_text_changed_callback, this);

 
 

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtkcombobox_changed_callback, this);

 }
 
 }
 

-void wxComboBox::Cut()
+GtkWidget* wxComboBox::GetConnectWidget()

 {
 {

-    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 );
+    return GTK_WIDGET( GetEntry() );

 }
 
 }
 

-void wxComboBox::Paste()
+GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxUnusedVar(windows);

 
 

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);
+    return GetEntry()->text_area;

 }
 
 }
 

-void wxComboBox::SetInsertionPoint( long pos )
+wxSize wxComboBox::DoGetBestSize() const

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxSize ret( wxControl::DoGetBestSize() );

 
 

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
-}
+    // 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;
+        }
+    }

 
 

-void wxComboBox::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    // empty combobox should have some reasonable default size too
+    if ( ret.x < 100 )
+        ret.x = 100;

 
 

-    SetInsertionPoint( -1 );
+    CacheBestSize(ret);
+    return ret;

 }
 
 }
 

-long wxComboBox::GetInsertionPoint() const
+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);

 }
 
 }
 

-long wxComboBox::GetLastPosition() const
+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------
+
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
-    return (long) pos-1;
+    Cut();

 }
 
 }
 

-void wxComboBox::Replace( long from, long to, const wxString& value )
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-    // FIXME: not quite sure how to do this method right in multibyte mode
-
-    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.mbc_str(), value.Length(), &pos );
+    Copy();

 }
 
 }
 

-void wxComboBox::Remove(long from, long to)
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))

 {
 {

-    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 );
+    Paste();

 }
 
 }
 

-void wxComboBox::SetSelection( long from, long to )
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
+    Undo();

 }
 
 }
 

-void wxComboBox::SetEditable( bool editable )
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
+    Redo();

 }
 
 }
 

-void wxComboBox::OnChar( wxKeyEvent &event )
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))

 {
 {

-    if ( event.KeyCode() == WXK_RETURN )
-    {
-        wxString value = GetValue();
-
-        if ( Number() == 0 )
-        {
-            // make Enter generate "selected" event if there is only one item
-            // in the combobox - without it, it's impossible to select it at
-            // all!
-            wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-            event.SetInt( 0 );
-            event.SetString( value );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-        }
-        else
-        {
-            // add the item to the list if it's not there yet
-            if ( FindString(value) == wxNOT_FOUND )
-            {
-                Append(value);
-                SetStringSelection(value);
-
-                // and generate the selected event for it
-                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-                event.SetInt( Number() - 1 );
-                event.SetString( value );
-                event.SetEventObject( this );
-                GetEventHandler()->ProcessEvent( event );
-            }
-
-            // 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);
-                    return;
-                }
-            }
-            
-            return;
-        }
-    }
-    
-    event.Skip();
+    long from, to;
+    GetSelection(& from, & to);
+    if (from != -1 && to != -1)
+        Remove(from, to);

 }
 
 }
 

-void wxComboBox::DisableEvents()
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))

 {
 {

-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
+    SetSelection(-1, -1);

 }
 
 }
 

-void wxComboBox::EnableEvents()
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)

 {
 {

-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_connect( GTK_OBJECT(child->data), "select",
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
+    event.Enable( CanCut() );

 }
 
 }
 

-void wxComboBox::OnSize( wxSizeEvent &event )
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)

 {
 {

-    event.Skip();
-
-#if 0
-    int w = 21;
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
-
-    gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
-#endif // 0
+    event.Enable( CanCopy() );

 }
 
 }
 

-void wxComboBox::ApplyWidgetStyle()
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)

 {
 {

-    SetWidgetStyle();
-
-//    gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
-
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
-
-        GtkBin *bin = GTK_BIN(child->data);
-        gtk_widget_set_style( bin->child, m_widgetStyle );
-
-        child = child->next;
-    }
+    event.Enable( CanPaste() );

 }
 
 }
 

-GtkWidget* wxComboBox::GetConnectWidget()
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)

 {
 {

-    return GTK_COMBO(m_widget)->entry;
+    event.Enable( CanUndo() );

 }
 
 }
 

-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)

 {
 {

-    return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
-             (window == GTK_COMBO(m_widget)->button->window ) );
+    event.Enable( CanRedo() );

 }
 
 }
 

-wxSize wxComboBox::DoGetBestSize() const
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)

 {
 {

-    wxSize ret( wxControl::DoGetBestSize() );
-
-    // we know better our horizontal extent: it depends on the longest string
-    // in the combobox
-    ret.x = 0;
-    if ( m_widget )
-    {
-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
-        size_t count = Number();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
-            if ( width > ret.x )
-                ret.x = width;
-        }
-    }
+    event.Enable(HasSelection() && IsEditable()) ;
+}

 
 

-    // empty combobox should have some reasonable default size too
-    if ( ret.x < 100 )
-        ret.x = 100;
-    return ret;
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+    event.Enable(GetLastPosition() > 0);

 }
 
 }
 

-#endif
+#endif // wxUSE_COMBOBOX