added wxWindow::HandleAsNavigationKey() helper for handling (not only) TAB key in...

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 5d76b098ff5c7d13c5865bb48f053c25e585dc29..af2b1092fdbcdd91a5331ab62d2c7ac6f8892af4 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -1,19 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/gtk/choice.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#if wxUSE_CHOICE

 
 #include "wx/choice.h"
 
 
 #include "wx/choice.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
+
+// FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in
+// favour of GtkComboBox.
+// Later use GtkComboBox if GTK+ runtime version is new enough.
+#include <gtk/gtkversion.h>
+#if defined(GTK_DISABLE_DEPRECATED) && GTK_CHECK_VERSION(2,3,0)
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
+#include "wx/gtk/private.h"
+

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


@@ -24,295 +37,484 @@ extern bool   g_blockEventsOnDrag;
 // "activate"
 //-----------------------------------------------------------------------------
 
 // "activate"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {

-  if (!choice->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
-  event.SetInt( choice->GetSelection() );
-  wxString tmp( choice->GetStringSelection() );
-  event.SetString( WXSTRINGCAST(tmp) );
-  event.SetEventObject(choice);
-  choice->GetEventHandler()->ProcessEvent(event);
+    if (!choice->m_hasVMT) return;
+
+    if (g_blockEventsOnDrag) return;
+
+    int selection = wxNOT_FOUND;
+
+    selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );
+
+    choice->m_selection_hack = selection;
+
+    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->HandleWindowEvent(event);
+}

 }
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 
 

-wxChoice::wxChoice(void)
+wxChoice::wxChoice()

 {
 {

+    m_strings = (wxSortedArrayString *)NULL;

 }
 
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 }
 
 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 wxPoint &pos, const wxSize &size,
+                       const wxArrayString& choices,
+                       long style, const wxValidator& validator,
+                       const wxString &name )

 {
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
-
-  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++)
-  {
-    GtkWidget *item = gtk_menu_item_new_with_label( choices[i] );
-    gtk_signal_connect( GTK_OBJECT( item ), "activate", 
-      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-    
-    gtk_menu_append( GTK_MENU(menu), item );
-    
-    gtk_widget_show( item );
-    gtk_widget_realize( item );
-    gtk_widget_realize( GTK_BIN(item)->child );
-  }
-  gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
-  
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-
-  Show( TRUE );
-    
-  return TRUE;
+    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;
+    }
+
+    m_widget = gtk_option_menu_new();
+
+    if ( IsSorted() )
+    {
+        // if our m_strings != NULL, Append() will check for it and insert
+        // items in the correct order
+        m_strings = new wxSortedArrayString;
+    }
+
+    // If we have items, GTK will choose the first item by default
+    m_selection_hack = n > 0 ? 0 : wxNOT_FOUND;
+
+    GtkWidget *menu = gtk_menu_new();
+
+    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(size);
+    SetInitialSize(size); // need this too because this is a wxControlWithItems
+
+    return true;

 }
 }

-      
-void wxChoice::Append( const wxString &item )
+
+wxChoice::~wxChoice()

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid choice" );
-
-  GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
-  GtkWidget *menu_item = gtk_menu_item_new_with_label( item );
-  
-  gtk_menu_append( GTK_MENU(menu), menu_item );
-  
-  gtk_widget_realize( menu_item );
-  gtk_widget_realize( GTK_BIN(menu_item)->child );
-  
-  if (m_hasOwnStyle)
-  {
-  
-    GtkBin *bin = GTK_BIN( menu_item );
-    
-    gtk_widget_set_style( bin->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-       
-    gtk_widget_set_style( GTK_WIDGET( bin ), 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-  }
-  
-  gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", 
-    GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-    
-  gtk_widget_show( menu_item );
+    Clear();
+
+    delete m_strings;

 }
 }

- 
-void wxChoice::Clear(void)
+
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid choice" );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
+
+    const unsigned int count = items.GetCount();
+
+    GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+
+    for ( unsigned int i = 0; i < count; ++i, ++pos )
+    {
+        int n = GtkAddHelper(menu, pos, items[i]);
+        if ( n == wxNOT_FOUND )
+            return n;
+
+        AssignNewItemClientData(n, clientData, i, type);
+    }
+
+    // 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
+        m_selection_hack += count;
+    }

 
 

-  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 );
+    // We must set the selection so that it can be read back even if 
+    // the user has not modified it since GTK+ will then select the
+    // first item so well return 0.
+    if ((count > 0) && (m_selection_hack==wxNOT_FOUND))
+        m_selection_hack = 0;
+
+    return pos - 1;

 }
 
 }
 

-void wxChoice::Delete( int WXUNUSED(n) )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-  wxFAIL_MSG( "wxChoice:Delete not implemented" );
+    m_clientData[n] = clientData;

 }
 
 }
 

-int wxChoice::FindString( const wxString &string ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-  wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" );
-
-  // If you read this code once and you think you understand
-  // it, then you are very wrong. Robert Roebling.
-  
-  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 );
-    GtkLabel *label = (GtkLabel *) NULL;
-    if (bin->child) label = GTK_LABEL(bin->child);
-    if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-    
-    wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-    
-    if (string == label->label) return count;
-    child = child->next;
-    count++;
-  }
-  
-  wxFAIL_MSG( "wxChoice: string not found" );
-  
-  return -1;
+    return m_clientData[n];

 }
 
 }
 

-int wxChoice::GetColumns(void) const
+void wxChoice::DoClear()

 {
 {

-  return 1;
+    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 );
+
+    m_clientData.Clear();
+
+    if ( m_strings )
+        m_strings->Clear();
+
+    // begin with no selection
+    m_selection_hack = wxNOT_FOUND;

 }
 
 }
 

-int wxChoice::GetSelection(void)
+void wxChoice::DoDeleteOneItem(unsigned int n)

 {
 {

-  wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" );
-
-  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++;
-  }
-  
-  wxFAIL_MSG( "wxChoice: no selection" );
-  
-  return -1;
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+    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;
+    }
+
+    // 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
+    const unsigned int count = GetCount();
+
+    wxArrayString items;
+    wxArrayPtrVoid itemsData;
+    items.Alloc(count - 1);
+    itemsData.Alloc(count - 1);
+    for ( unsigned i = 0; i < count; i++ )
+    {
+        if ( i != n )
+        {
+            items.Add(GetString(i));
+            itemsData.Add(m_clientData[i]);
+        }
+    }
+
+    wxChoice::DoClear();
+
+    if ( count > 1 )
+    {
+        void ** const data = &itemsData[0];
+        if ( HasClientObjectData() )
+            Append(items, wx_reinterpret_cast(wxClientData **, data));
+        else
+            Append(items, data);
+    }
+    //else: the control is now empty, nothing to append

 }
 
 }
 

-wxString wxChoice::GetString( int n ) const
+int wxChoice::FindString( const wxString &string, bool bCase ) const

 {
 {

-  wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
-
-  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 (count == n)
+    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.
+
+    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)

     {
     {

-      GtkLabel *label = (GtkLabel *) NULL;
-      if (bin->child) label = GTK_LABEL(bin->child);
-      if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-      
-      wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-      
-      return label->label;
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkLabel *label = (GtkLabel *) NULL;
+        if (bin->child)
+            label = GTK_LABEL(bin->child);
+        if (!label)
+            label = GTK_LABEL(GTK_BIN(m_widget)->child);
+
+        wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+         wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
+        if (string.IsSameAs( tmp, bCase ))
+            return count;
+
+        child = child->next;
+        count++;

     }
     }

-    child = child->next;
-    count++;
-  }
-  
-  wxFAIL_MSG( "wxChoice: string not found" );
-  
-  return "";
+
+    return wxNOT_FOUND;

 }
 
 }
 

-wxString wxChoice::GetStringSelection(void) const
+int wxChoice::GetSelection() const

 {
 {

-  wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
+
+    return m_selection_hack;

 
 

-  GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-  
-  wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-  
-  return label->label;

 }
 
 }
 

-int wxChoice::Number(void) const
+void wxChoice::SetString(unsigned int n, const wxString& str)

 {
 {

-  wxCHECK_MSG( m_widget != NULL, 0, "invalid choice" );
-
-  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)
-  {
-    count++;
-    child = child->next;
-  }
-  return count;
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+
+    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+    unsigned int count = 0;
+    GList *child = menu_shell->children;
+    while (child)
+    {
+        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(GTK_BIN(m_widget)->child);
+
+            wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+            gtk_label_set_text( label, wxGTK_CONV( str ) );
+            
+            InvalidateBestSize();
+
+            return;
+        }
+        child = child->next;
+        count++;
+    }

 }
 
 }
 

-void wxChoice::SetColumns( int WXUNUSED(n) )
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

+    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) ) );
+    unsigned int count = 0;
+    GList *child = menu_shell->children;
+    while (child)
+    {
+        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(GTK_BIN(m_widget)->child);
+
+            wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+            return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
+        }
+        child = child->next;
+        count++;
+    }
+
+    wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
+
+    return wxEmptyString;
+}
+
+unsigned int wxChoice::GetCount() const
+{
+    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) ) );
+    unsigned int count = 0;
+    GList *child = menu_shell->children;
+    while (child)
+    {
+        count++;
+        child = child->next;
+    }
+    return count;

 }
 
 void wxChoice::SetSelection( int n )
 {
 }
 
 void wxChoice::SetSelection( int n )
 {

-  wxCHECK_RET( m_widget != NULL, "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 );
+
+    // set the local selection variable manually
+    if ((n >= 0) && ((unsigned int)n < GetCount()))
+    {
+        // 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::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_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 = GTK_BIN(m_widget)->child;

 
 

-  int tmp = n;
-  gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
-  
-  gtk_choice_clicked_callback( (GtkWidget *) NULL, this );
+        gtk_widget_modify_style( label, style );
+
+        child = child->next;
+    }

 }
 
 }
 

-void wxChoice::SetStringSelection( const wxString &string )
+int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid choice" );
+    wxCHECK_MSG(pos<=m_clientData.GetCount(), -1, wxT("invalid index"));
+
+    GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
+
+    if ( m_strings )
+    {
+        // sorted control, need to insert at the correct index
+        pos = m_strings->Add(item);
+    }
+
+    // don't call wxChoice::GetCount() from here because it doesn't work
+    // if we're called from ctor (and GtkMenuShell is still NULL)
+    if (pos == m_clientData.GetCount())
+        gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
+    else
+        gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );
+
+    m_clientData.Insert( NULL, pos );

 
 

-  int n = FindString( string );
-  if (n != -1) SetSelection( n );
+    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();
+
+    g_signal_connect_after (menu_item, "activate",
+                            G_CALLBACK (gtk_choice_clicked_callback),
+                            this);
+
+    gtk_widget_show( menu_item );
+
+    // return the index of the item in the control
+    return pos;

 }
 
 }
 

-void wxChoice::SetFont( const wxFont &font )
+wxSize wxChoice::DoGetBestSize() const

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid choice" );
-
-  wxControl::SetFont( font );
-   
-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkWidget *label = (GtkWidget *) NULL;
-    if (bin->child) label = bin->child;
-    if (!label) label = GTK_BUTTON(m_widget)->child;
-    
-    gtk_widget_set_style( label,
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-       
-    child = child->next;
-  }
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    // 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;
+        }
+
+        // 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 )
+        ret.x = 80;
+
+    // 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();
+
+    CacheBestSize(ret);
+    return ret;

 }
 
 }
 

-void wxChoice::SetBackgroundColour( const wxColour &colour )
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-  return;
-
-  wxCHECK_RET( m_widget != NULL, "invalid choice" );
-
-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  GtkStyle *style = gtk_widget_get_style( m_widget );
-
-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  
-  gtk_widget_set_style( GTK_WIDGET( menu_shell ), gtk_style_ref( style ) );
-  
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    gtk_widget_set_style( GTK_WIDGET( child->data ), gtk_style_ref( style ) );
-    child = child->next;
-  }
+    return GTK_BUTTON(m_widget)->event_window;

 }
 
 }
 

+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new);
+}

 
 
 
 

+#endif // wxUSE_CHOICE