X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e1d71048207f3d008dac28d0c290ae0a6b59997..d26cb76b58d53bdd667e706f12442c349ff13bc1:/src/gtk/choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index ef17528812..759985b65b 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.cpp
+// Name:        src/gtk/choice.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,481 +7,382 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_CHOICE
+#if wxUSE_CHOICE || wxUSE_COMBOBOX
 
 #include "wx/choice.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
+
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+extern "C" {
 
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "activate"
-//-----------------------------------------------------------------------------
-
-static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
+static void
+gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
-    if (g_isIdle)
-      wxapp_install_idle_handler();
-
-    if (!choice->m_hasVMT) return;
-
-    if (g_blockEventsOnDrag) return;
-
-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
-    int n = choice->GetSelection();
-
-    event.SetInt( n );
-    event.SetString( choice->GetStringSelection() );
-    event.SetEventObject(choice);
-
-    if ( choice->HasClientObjectData() )
-        event.SetClientObject( choice->GetClientObject(n) );
-    else if ( choice->HasClientUntypedData() )
-        event.SetClientData( choice->GetClientData(n) );
+    choice->SendSelectionChangedEvent(wxEVT_COMMAND_CHOICE_SELECTED);
+}
 
-    choice->GetEventHandler()->ProcessEvent(event);
 }
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
 
-wxChoice::wxChoice()
+void wxChoice::Init()
 {
-    m_strings = (wxSortedArrayString *)NULL;
+    m_strings = NULL;
+    m_stringCellIndex = 0;
 }
 
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,
                        const wxPoint &pos, const wxSize &size,
-                       int n, const wxString choices[],
-                       long style, const wxValidator& validator, const wxString &name )
+                       const wxArrayString& choices,
+                       long style, const wxValidator& validator,
+                       const wxString &name )
 {
-    m_needParent = TRUE;
-#if (GTK_MINOR_VERSION > 0)
-    m_acceptsFocus = TRUE;
-#endif
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                   style, validator, name );
+}
 
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+                       const wxPoint &pos, const wxSize &size,
+                       int n, const wxString choices[],
+                       long style, const wxValidator& validator,
+                       const wxString &name )
+{
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxChoice creation failed") );
-        return FALSE;
+        return false;
     }
 
-    m_widget = gtk_option_menu_new();
-
-    if ( style & wxCB_SORT )
+    if ( IsSorted() )
     {
-        // if our m_strings != NULL, DoAppend() will check for it and insert
+        // if our m_strings != NULL, Append() will check for it and insert
         // items in the correct order
         m_strings = new wxSortedArrayString;
     }
 
-    GtkWidget *menu = gtk_menu_new();
+    m_widget = gtk_combo_box_new_text();
+    g_object_ref(m_widget);
 
-    for (int i = 0; i < n; i++)
-    {
-        GtkAppendHelper(menu, choices[i]);
-    }
-
-    gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+    Append(n, choices);
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
-    SetFont( parent->GetFont() );
+    PostCreation(size);
 
-    SetBestSize(size);
+    g_signal_connect_after (m_widget, "changed",
+                            G_CALLBACK (gtk_choice_changed_callback), this);
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-
-    Show( TRUE );
-
-    return TRUE;
+    return true;
 }
 
 wxChoice::~wxChoice()
 {
-    Clear();
-
     delete m_strings;
 }
 
-int wxChoice::DoAppend( const wxString &item )
+void wxChoice::SendSelectionChangedEvent(wxEventType evt_type)
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
-
-    GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+    if (!m_hasVMT)
+        return;
 
-    return GtkAppendHelper(menu, item);
-}
+    if (GetSelection() == -1)
+        return;
 
-void wxChoice::DoSetItemClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
+    wxCommandEvent event( evt_type, GetId() );
 
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
+    int n = GetSelection();
+    event.SetInt( n );
+    event.SetString( GetStringSelection() );
+    event.SetEventObject( this );
+    InitCommandEventWithItems( event, n );
 
-    node->SetData( (wxObject*) clientData );
+    HandleWindowEvent( event );
 }
 
-void* wxChoice::DoGetItemClientData( int n ) const
+void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
 {
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
-
-    return node->Data();
+    gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) );
 }
 
-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
 
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
+    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+                 wxT("In a sorted choice data could only be appended"));
 
-    wxClientData *cd = (wxClientData*) node->Data();
-    delete cd;
+    const int count = items.GetCount();
 
-    node->SetData( (wxObject*) clientData );
-}
+    int n = wxNOT_FOUND;
 
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
+    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]);
 
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxChoice::DoGetItemClientObject") );
+        GTKInsertComboBoxTextItem( n, items[i] );
 
-    return (wxClientData*) node->Data();
-}
+        m_clientData.Insert( NULL, n );
+        AssignNewItemClientData(n, clientData, i, type);
+    }
 
-void wxChoice::Clear()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+    InvalidateBestSize();
 
-    gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
-    GtkWidget *menu = gtk_menu_new();
-    gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+    return n;
+}
 
-    if ( HasClientObjectData() )
-    {
-        // destroy the data (due to Robert's idea of using wxList<wxObject>
-        // and not wxList<wxClientData> we can't just say
-        // m_clientList.DeleteContents(TRUE) - this would crash!
-        wxNode *node = m_clientList.First();
-        while ( node )
-        {
-            delete (wxClientData *)node->Data();
-            node = node->Next();
-        }
-    }
-    m_clientList.Clear();
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
+{
+    m_clientData[n] = clientData;
+}
 
-    if ( m_strings )
-        m_strings->Clear();
+void* wxChoice::DoGetItemClientData(unsigned int n) const
+{
+    return m_clientData[n];
 }
 
-void wxChoice::Delete( int n )
+void wxChoice::DoClear()
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
-    // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
-    //     in 2.0), hence this dump implementation - still better than nothing
-    int i,
-        count = GetCount();
+    DisableEvents();
 
-    wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") );
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+    gtk_list_store_clear(GTK_LIST_STORE(model));
 
-    wxArrayString items;
-    items.Alloc(count);
-    for ( i = 0; i < count; i++ )
-    {
-        if ( i != n )
-            items.Add(GetString(i));
-    }
+    m_clientData.Clear();
+
+    if (m_strings)
+        m_strings->Clear();
 
-    Clear();
+    EnableEvents();
 
-    for ( i = 0; i < count - 1; i++ )
-    {
-        Append(items[i]);
-    }
+    InvalidateBestSize();
 }
 
-int wxChoice::FindString( const wxString &string ) const
+void wxChoice::DoDeleteOneItem(unsigned int n)
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );
+
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+    GtkListStore* store = GTK_LIST_STORE(model);
+    GtkTreeIter iter;
+    gtk_tree_model_iter_nth_child( model, &iter,
+                                   NULL, (gint) n );
+    gtk_list_store_remove( store, &iter );
+
+    m_clientData.RemoveAt( n );
+    if ( m_strings )
+        m_strings->RemoveAt( n );
 
-    // If you read this code once and you think you understand
-    // it, then you are very wrong. Robert Roebling.
+    InvalidateBestSize();
+}
 
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+int wxChoice::FindString( const wxString &item, bool bCase ) const
+{
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid control") );
+
+    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;
-    GList *child = menu_shell->children;
-    while (child)
+    do
     {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = (GtkLabel *) NULL;
-        if (bin->child)
-            label = GTK_LABEL(bin->child);
-        if (!label)
-            label = GTK_LABEL( BUTTON_CHILD(m_widget) );
-
-        wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
-        
-#ifdef __WXGTK20__
-         wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
-#else
-         wxString tmp( label->label );
-#endif
-        if (string == tmp)
+        GValue value = { 0, };
+        gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
+        wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
+        g_value_unset( &value );
+
+        if (item.IsSameAs( str, bCase ) )
             return count;
 
-        child = child->next;
         count++;
     }
+    while ( gtk_tree_model_iter_next(model, &iter) );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 int wxChoice::GetSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
-    
-#ifdef __WXGTK20__
-
-    return gtk_option_menu_get_history( GTK_OPTION_MENU(m_widget) );
-    
-#else
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    int count = 0;
-    
-    GList *child = menu_shell->children;
-    while (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        if (!bin->child) return count;
-        child = child->next;
-        count++;
-    }
-
-    return -1;
-#endif
+    return gtk_combo_box_get_active( GTK_COMBO_BOX( m_widget ) );
 }
 
-void wxChoice::SetString( int WXUNUSED(n), const wxString& WXUNUSED(string) )
+void wxChoice::SetString(unsigned int n, const wxString &text)
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
-
-    wxFAIL_MSG(wxT("not implemented"));
-}
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
-wxString wxChoice::GetString( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    wxCHECK_RET( IsValid(n), wxT("invalid index") );
 
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    int count = 0;
-    GList *child = menu_shell->children;
-    while (child)
+    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( child->data );
-        if (count == n)
-        {
-            GtkLabel *label = (GtkLabel *) NULL;
-            if (bin->child)
-                label = GTK_LABEL(bin->child);
-            if (!label)
-                label = GTK_LABEL( BUTTON_CHILD(m_widget) );
-
-            wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
-
-#ifdef __WXGTK20__
-            return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
-#else
-            return wxString( label->label );
-#endif
-        }
-        child = child->next;
-        count++;
+        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, m_stringCellIndex, &value );
+        g_value_unset( &value );
     }
 
-    wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
-
-    return wxT("");
+    InvalidateBestSize();
 }
 
-int wxChoice::GetCount() const
+wxString wxChoice::GetString(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid control") );
 
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    int count = 0;
-    GList *child = menu_shell->children;
-    while (child)
+    wxString str;
+
+    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))
     {
-        count++;
-        child = child->next;
+        GValue value = { 0, };
+        gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
+        wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) );
+        g_value_unset( &value );
+        return tmp;
     }
-    return count;
+
+    return str;
 }
 
-void wxChoice::SetSelection( int n )
+unsigned int wxChoice::GetCount() const
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
-
-    int tmp = n;
-    gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid control") );
+
+    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 wxChoice::ApplyWidgetStyle()
+void wxChoice::SetSelection( int n )
 {
-    SetWidgetStyle();
-
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
-    GList *child = menu_shell->children;
-    while (child)
-    {
-        gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
-
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkWidget *label = (GtkWidget *) NULL;
-        if (bin->child)
-            label = bin->child;
-        if (!label)
-            label = BUTTON_CHILD(m_widget);
+    DisableEvents();
 
-        gtk_widget_set_style( label, m_widgetStyle );
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    gtk_combo_box_set_active( combobox, n );
 
-        child = child->next;
-    }
+    EnableEvents();
 }
 
-size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
+void wxChoice::SetColumns(int n)
 {
-    GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
-
-    size_t index;
-    if ( m_strings )
-    {
-        // sorted control, need to insert at the correct index
-        index = m_strings->Add(item);
-
-        gtk_menu_insert( GTK_MENU(menu), menu_item, index );
-
-        if ( index )
-        {
-            m_clientList.Insert( m_clientList.Item(index - 1),
-                                 (wxObject*) NULL );
-        }
-        else
-        {
-            m_clientList.Insert( (wxObject*) NULL );
-        }
-    }
-    else
-    {
-        // normal control, just append
-        gtk_menu_append( GTK_MENU(menu), menu_item );
-
-        m_clientList.Append( (wxObject*) NULL );
+    gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n);
+}
 
-        // don't call wxChoice::GetCount() from here because it doesn't work
-        // if we're called from ctor (and GtkMenuShell is still NULL)
-        index = m_clientList.GetCount() - 1;
-    }
+int wxChoice::GetColumns() const
+{
+    // gtk_combo_box_get_wrap_width() was added in gtk 2.6
+    gint intval;
+    g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL);
+    return intval;
+}
 
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( menu_item );
-        gtk_widget_realize( GTK_BIN(menu_item)->child );
 
-        if (m_widgetStyle) ApplyWidgetStyle();
-    }
+void wxChoice::DisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widget,
+                                (gpointer) gtk_choice_changed_callback, this);
+}
 
-    gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
-      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+void wxChoice::EnableEvents()
+{
+    g_signal_handlers_unblock_by_func(m_widget,
+                                (gpointer) gtk_choice_changed_callback, this);
+}
 
-    gtk_widget_show( menu_item );
 
-    // return the index of the item in the control
-    return index;
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return m_widget->window;
 }
 
+// Notice that this method shouldn't be necessary, because GTK calculates
+// properly size of the combobox but for unknown reasons it doesn't work
+// correctly in wx without this.
 wxSize wxChoice::DoGetBestSize() const
 {
+    // strangely, this returns a width of 188 pixels from GTK+ (?)
     wxSize ret( wxControl::DoGetBestSize() );
 
     // we know better our horizontal extent: it depends on the longest string
-    // we have
-    ret.x = 0;
+    // in the combobox
     if ( m_widget )
     {
-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        ret.x = GetCount() > 0 ? 0 : 60;  // start with something "sensible"
+        int width;
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
         {
-            // FIXME GTK 2.0
-            width = (wxCoord)gdk_string_width(font, wxGTK_CONV( GetString(n) ) );
-            if ( width > ret.x )
-                ret.x = width;
+            GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
+            if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text
+                ret.x = width + 40;
         }
-
-        // add extra for the choice "=" button
-
-        // VZ: I don't know how to get the right value, it seems to be in
-        //     GtkOptionMenuProps struct from gtkoptionmenu.c but we can't get
-        //     to it - maybe we can use gtk_option_menu_size_request() for this
-        //     somehow?
-        //
-        //     This default value works only for the default GTK+ theme (i.e.
-        //     no theme at all) (FIXME)
-        static const int widthChoiceIndicator = 35;
-        ret.x += widthChoiceIndicator;
     }
 
-    // but not less than the minimal width
-    if ( ret.x < 80 )
+    // empty combobox should have some reasonable default size too
+    if ((GetCount() == 0) && (ret.x < 80))
         ret.x = 80;
 
-    ret.y = 16 + gdk_char_height(GET_STYLE_FONT( m_widget->style ), 'H' );
-
+    CacheBestSize(ret);
     return ret;
 }
 
-#endif // wxUSE_CHOICE
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
+}
+
+
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new);
+}
+
 
+#endif // wxUSE_CHOICE || wxUSE_COMBOBOX