X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..a305d600e2b4b233c9263abacc39e6da88c0171e:/src/gtk1/choice.cpp

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 21a697ce57..1372a2398f 100644
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.cpp
+// Name:        src/gtk1/choice.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,17 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#if wxUSE_CHOICE
 
 #include "wx/choice.h"
 
-#if wxUSE_CHOICE
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -36,21 +36,51 @@ extern bool   g_blockEventsOnDrag;
 // "activate"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
       wxapp_install_idle_handler();
 
     if (!choice->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
 
+    int selection = wxNOT_FOUND;
+
+    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(choice->GetHandle()) ) );
+    int count = 0;
+
+    GList *child = menu_shell->children;
+    while (child)
+    {
+        GtkBin *bin = GTK_BIN( child->data );
+        if (!bin->child)
+        {
+            selection = count;
+            break;
+        }
+        child = child->next;
+        count++;
+    }
+
+    choice->m_selection_hack = selection;
+
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
-    event.SetInt( choice->GetSelection() );
+    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->GetEventHandler()->ProcessEvent(event);
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxChoice
@@ -60,6 +90,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
 
 wxChoice::wxChoice()
 {
+    m_strings = (wxSortedArrayString *)NULL;
+}
+
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+                       const wxPoint &pos, const wxSize &size,
+                       const wxArrayString& choices,
+                       long style, const wxValidator& validator,
+                       const wxString &name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                   style, validator, name );
 }
 
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,
@@ -67,180 +110,233 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
                        int n, const wxString choices[],
                        long style, const wxValidator& validator, const wxString &name )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 #if (GTK_MINOR_VERSION > 0)
-    m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 #endif
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
-        wxFAIL_MSG( T("wxChoice creation failed") );
-	return FALSE;
+        wxFAIL_MSG( wxT("wxChoice creation failed") );
+        return false;
     }
 
     m_widget = gtk_option_menu_new();
 
-    wxSize newSize(size);
-    if (newSize.x == -1)
-        newSize.x = 80;
-    if (newSize.y == -1)
-        newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
-
-    GtkWidget *menu = gtk_menu_new();
-
-    for (int i = 0; i < n; i++)
+    if ( style & wxCB_SORT )
     {
-        m_clientDataList.Append( (wxObject*) NULL );
-        m_clientObjectList.Append( (wxObject*) NULL );
+        // if our m_strings != NULL, DoAppend() will check for it and insert
+        // items in the correct order
+        m_strings = new wxSortedArrayString;
+    }
 
-        GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
-        gtk_menu_append( GTK_MENU(menu), item );
+    // begin with no selection
+    m_selection_hack = wxNOT_FOUND;
 
-        gtk_widget_show( item );
+    GtkWidget *menu = gtk_menu_new();
 
-        gtk_signal_connect( GTK_OBJECT( item ), "activate",
-          GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+    for (unsigned int i = 0; i < (unsigned int)n; i++)
+    {
+        GtkAddHelper(menu, i, choices[i]);
     }
+
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
-
-    Show( TRUE );
+    PostCreation(size);
+    SetBestSize(size); // need this too because this is a wxControlWithItems
 
-    return TRUE;
+    return true;
 }
 
 wxChoice::~wxChoice()
 {
     Clear();
+
+    delete m_strings;
 }
 
-void wxChoice::AppendCommon( const wxString &item )
+int wxChoice::DoAppend( const wxString &item )
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
-    GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
-
-    gtk_menu_append( GTK_MENU(menu), menu_item );
 
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( menu_item );
-        gtk_widget_realize( GTK_BIN(menu_item)->child );
-
-        if (m_widgetStyle) ApplyWidgetStyle();
-    }
-
-    gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
-      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
-    gtk_widget_show( menu_item );
+    return GtkAddHelper(menu, GetCount(), item);
 }
 
-void wxChoice::Append( const wxString &item )
+int wxChoice::DoInsert( const wxString &item, unsigned int pos )
 {
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
+    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));
 
-    AppendCommon( item );
-}
+    if (pos == GetCount())
+        return DoAppend(item);
 
-void wxChoice::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    AppendCommon( item );
-}
+    GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
 
-void wxChoice::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientObjectList.Append( (wxObject*) clientData );
-    m_clientDataList.Append( (wxObject*) NULL );
+    // if the item to insert is at or before the selection, and the selection is valid
+    if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+    {
+        // move the selection forward one
+        m_selection_hack++;
+    }
 
-    AppendCommon( item );
+    return GtkAddHelper(menu, pos, item);
 }
 
-void wxChoice::SetClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
 
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
 
     node->SetData( (wxObject*) clientData );
 }
 
-void* wxChoice::GetClientData( int n )
+void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, NULL, T("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
 
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
 
-    return node->Data();
+    return node->GetData();
 }
 
-void wxChoice::SetClientObject( int n, wxClientData* clientData )
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
 
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
 
-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
+    // wxItemContainer already deletes data for us
 
     node->SetData( (wxObject*) clientData );
 }
 
-wxClientData* wxChoice::GetClientObject( int n )
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, T("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
 
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_MSG( node, (wxClientData *)NULL,
+                 wxT("invalid index in wxChoice::DoGetItemClientObject") );
 
-    return (wxClientData*) node->Data();
+    return (wxClientData*) node->GetData();
 }
 
 void wxChoice::Clear()
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid choice") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
 
     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 );
 
-    wxNode *node = m_clientObjectList.First();
-    while (node)
+    if ( HasClientObjectData() )
     {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
+        // 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!
+        wxList::compatibility_iterator node = m_clientList.GetFirst();
+        while ( node )
+        {
+            delete (wxClientData *)node->GetData();
+            node = node->GetNext();
+        }
     }
-    m_clientObjectList.Clear();
+    m_clientList.Clear();
 
-    m_clientDataList.Clear();
+    if ( m_strings )
+        m_strings->Clear();
+
+    // begin with no selection
+    m_selection_hack = wxNOT_FOUND;
 }
 
-void wxChoice::Delete( int WXUNUSED(n) )
+void wxChoice::Delete(unsigned int n)
 {
-    wxFAIL_MSG( T("wxChoice:Delete not implemented") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+
+    // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
+    //     in 2.0), hence this dumb implementation -- still better than nothing
+    unsigned int i;
+    unsigned int count = GetCount();
+
+    wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
+
+    // if the item to delete is before the selection, and the selection is valid
+    if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+    {
+        // move the selection back one
+        m_selection_hack--;
+    }
+    else if ((int)n == m_selection_hack)
+    {
+        // invalidate the selection
+        m_selection_hack = wxNOT_FOUND;
+    }
+
+    const bool hasClientData = m_clientDataItemsType != wxClientData_None;
+    const bool hasObjectData = m_clientDataItemsType == wxClientData_Object;
+
+    wxList::compatibility_iterator node = m_clientList.GetFirst();
+
+    wxArrayString items;
+    wxArrayPtrVoid itemsData;
+    items.Alloc(count);
+    for ( i = 0; i < count; i++ )
+    {
+        if ( i != n )
+        {
+            items.Add(GetString(i));
+            if ( hasClientData )
+            {
+                // also save the client data
+                itemsData.Add(node->GetData());
+            }
+        }
+        else // need to delete the client object too
+        {
+            if ( hasObjectData )
+            {
+                delete (wxClientData *)node->GetData();
+            }
+        }
+
+        if ( hasClientData )
+        {
+            node = node->GetNext();
+        }
+    }
+
+    if ( hasObjectData )
+    {
+        // prevent Clear() from destroying all client data
+        m_clientDataItemsType = wxClientData_None;
+    }
+
+    Clear();
+
+    for ( i = 0; i < count - 1; i++ )
+    {
+        Append(items[i]);
+
+        if ( hasObjectData )
+            SetClientObject(i, (wxClientData *)itemsData[i]);
+        else if ( hasClientData )
+            SetClientData(i, itemsData[i]);
+    }
 }
 
-int wxChoice::FindString( const wxString &string ) const
+int wxChoice::FindString( const wxString &string, bool bCase ) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, T("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
 
     // If you read this code once and you think you understand
     // it, then you are very wrong. Robert Roebling.
@@ -252,50 +348,68 @@ int wxChoice::FindString( const wxString &string ) const
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = (GtkLabel *) NULL;
-        if (bin->child) label = GTK_LABEL(bin->child);
-        if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
+        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") );
 
-        wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+         wxString tmp( label->label );
 
-       if (string == wxString(label->label,*wxConvCurrent))
-           return count;
+         if (string.IsSameAs( tmp, bCase ))
+            return count;
 
-       child = child->next;
-       count++;
+        child = child->next;
+        count++;
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
-int wxChoice::GetColumns() const
+int wxChoice::GetSelection() const
 {
-    return 1;
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
+
+    return m_selection_hack;
+
 }
 
-int wxChoice::GetSelection()
+void wxChoice::SetString(unsigned int n, const wxString& str )
 {
-    wxCHECK_MSG( m_widget != NULL, -1, T("invalid choice") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    int count = 0;
+    unsigned int count = 0;
     GList *child = menu_shell->children;
     while (child)
     {
         GtkBin *bin = GTK_BIN( child->data );
-        if (!bin->child) return count;
+        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") );
+
+            gtk_label_set_text( label, wxGTK_CONV( str ) );
+
+            return;
+        }
         child = child->next;
         count++;
     }
-
-    return -1;
 }
 
-wxString wxChoice::GetString( int n ) const
+wxString wxChoice::GetString(unsigned int n) const
 {
-    wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid choice") );
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    int count = 0;
+    unsigned int count = 0;
     GList *child = menu_shell->children;
     while (child)
     {
@@ -303,39 +417,30 @@ wxString wxChoice::GetString( int n ) const
         if (count == n)
         {
             GtkLabel *label = (GtkLabel *) NULL;
-            if (bin->child) label = GTK_LABEL(bin->child);
-            if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
+            if (bin->child)
+                label = GTK_LABEL(bin->child);
+            if (!label)
+                label = GTK_LABEL( BUTTON_CHILD(m_widget) );
 
-            wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+            wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
-            return wxString(label->label,*wxConvCurrent);
+            return wxString( label->label );
         }
         child = child->next;
         count++;
     }
 
-    wxFAIL_MSG( T("wxChoice: invalid index in GetString()") );
+    wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
 
-    return T("");
+    return wxEmptyString;
 }
 
-wxString wxChoice::GetStringSelection() const
+unsigned int wxChoice::GetCount() const
 {
-    wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
-
-    GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-
-    wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
-
-    return wxString(label->label,*wxConvCurrent);
-}
-
-int wxChoice::Number() const
-{
-    wxCHECK_MSG( m_widget != NULL, 0, T("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    int count = 0;
+    unsigned int count = 0;
     GList *child = menu_shell->children;
     while (child)
     {
@@ -345,79 +450,180 @@ int wxChoice::Number() const
     return count;
 }
 
-void wxChoice::SetColumns( int WXUNUSED(n) )
-{
-}
-
 void wxChoice::SetSelection( int n )
 {
-    wxCHECK_RET( m_widget != NULL, T("invalid choice") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
 
     int tmp = n;
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
-}
-
-void wxChoice::SetStringSelection( const wxString &string )
-{
-    wxCHECK_RET( m_widget != NULL, T("invalid choice") );
 
-    int n = FindString( string );
-    if (n != -1) SetSelection( n );
+    // set the local selection variable manually
+    if (IsValid((unsigned int)n))
+    {
+        // a valid selection has been made
+        m_selection_hack = n;
+    }
+    else if ((n == wxNOT_FOUND) || (GetCount() == 0))
+    {
+        // invalidates the selection if there are no items
+        // or if it is specifically set to wxNOT_FOUND
+        m_selection_hack = wxNOT_FOUND;
+    }
+    else
+    {
+        // this selects the first item by default if the selection is out of bounds
+        m_selection_hack = 0;
+    }
 }
 
-void wxChoice::DisableEvents()
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-/*
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+
+    gtk_widget_modify_style( m_widget, style );
+    gtk_widget_modify_style( GTK_WIDGET( menu_shell ), style );
+
     GList *child = menu_shell->children;
     while (child)
     {
-        gtk_signal_disconnect_by_func( GTK_OBJECT( child->data ),
-          GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+        gtk_widget_modify_style( GTK_WIDGET( child->data ), style );
+
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkWidget *label = (GtkWidget *) NULL;
+        if (bin->child)
+            label = bin->child;
+        if (!label)
+            label = BUTTON_CHILD(m_widget);
+
+        gtk_widget_modify_style( label, style );
 
         child = child->next;
     }
-*/
 }
 
-void wxChoice::EnableEvents()
+int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)
 {
-/*
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    GList *child = menu_shell->children;
-    while (child)
+    wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index"));
+
+    GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
+
+    size_t index;
+    if ( m_strings )
     {
-        gtk_signal_connect( GTK_OBJECT( child->data ), "activate",
-          GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+        // sorted control, need to insert at the correct index
+        index = m_strings->Add(item);
 
-        child = child->next;
+        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
+    {
+        // don't call wxChoice::GetCount() from here because it doesn't work
+        // if we're called from ctor (and GtkMenuShell is still NULL)
+
+        // normal control, just append
+        if (pos == m_clientList.GetCount())
+        {
+            gtk_menu_append( GTK_MENU(menu), menu_item );
+            m_clientList.Append( (wxObject*) NULL );
+            index = m_clientList.GetCount() - 1;
+        }
+        else
+        {
+            gtk_menu_insert( GTK_MENU(menu), menu_item, pos );
+            m_clientList.Insert( pos, (wxObject*) NULL );
+            index = pos;
+        }
     }
-*/
+
+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( menu_item );
+        gtk_widget_realize( GTK_BIN(menu_item)->child );
+
+        ApplyWidgetStyle();
+    }
+
+    // The best size of a wxChoice should probably
+    // be changed everytime the control has been
+    // changed, but at least after adding an item
+    // it has to change. Adapted from Matt Ownby.
+    InvalidateBestSize();
+
+    gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate",
+      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+
+    gtk_widget_show( menu_item );
+
+    // return the index of the item in the control
+    return index;
 }
 
-void wxChoice::ApplyWidgetStyle()
+wxSize wxChoice::DoGetBestSize() const
 {
-    SetWidgetStyle();
+    wxSize ret( wxControl::DoGetBestSize() );
 
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+    // we know better our horizontal extent: it depends on the longest string
+    // we have
+    ret.x = 0;
+    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;
+        }
 
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+        // 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;
+    }
 
-    GList *child = menu_shell->children;
-    while (child)
-    {
-        gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+    // but not less than the minimal width
+    if ( ret.x < 80 )
+        ret.x = 80;
 
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkWidget *label = (GtkWidget *) NULL;
-        if (bin->child) label = bin->child;
-        if (!label) label = GTK_BUTTON(m_widget)->child;
+    // If this request_size is called with no entries then
+    // the returned height is wrong. Give it a reasonable
+    // default value.
+    if (ret.y <= 18)
+        ret.y = 8 + GetCharHeight();
 
-        gtk_widget_set_style( label, m_widgetStyle );
+    CacheBestSize(ret);
+    return ret;
+}
 
-        child = child->next;
-    }
+bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
+{
+    return (window == m_widget->window);
 }
 
-#endif
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new);
+}
+
+
+#endif // wxUSE_CHOICE