X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..24b9f055150de329d1fb61df5ce8d14e6d657cd0:/src/gtk1/choice.cpp

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 7e2499fe45..0106c68dff 100644
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -12,12 +12,14 @@
 #pragma implementation "choice.h"
 #endif
 
-#include "wx/choice.h"
+#include "wx/defs.h"
 
 #if wxUSE_CHOICE
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/choice.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -90,8 +92,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     m_widget = gtk_option_menu_new();
 
-    SetSizeOrDefault( size );
-
     if ( style & wxCB_SORT )
     {
         // if our m_strings != NULL, DoAppend() will check for it and insert
@@ -103,7 +103,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     for (int i = 0; i < n; i++)
     {
-        AppendHelper(menu, choices[i]);
+        GtkAppendHelper(menu, choices[i]);
     }
 
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
@@ -112,9 +112,19 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
+    SetFont( parent->GetFont() );
+
+    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.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -134,7 +144,7 @@ int wxChoice::DoAppend( const wxString &item )
 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
 
-    return AppendHelper(menu, item);
+    return GtkAppendHelper(menu, item);
 }
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
@@ -318,36 +328,6 @@ void wxChoice::SetSelection( int n )
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 }
 
-void wxChoice::DisableEvents()
-{
-/*
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    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 );
-
-        child = child->next;
-    }
-*/
-}
-
-void wxChoice::EnableEvents()
-{
-/*
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    GList *child = menu_shell->children;
-    while (child)
-    {
-        gtk_signal_connect( GTK_OBJECT( child->data ), "activate",
-          GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
-        child = child->next;
-    }
-*/
-}
-
 void wxChoice::ApplyWidgetStyle()
 {
     SetWidgetStyle();
@@ -373,7 +353,7 @@ void wxChoice::ApplyWidgetStyle()
     }
 }
 
-size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
+size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
 {
     GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
 
@@ -426,7 +406,10 @@ size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
 
 wxSize wxChoice::DoGetBestSize() const
 {
-    return wxSize(80, 26);
+    wxSize ret( wxControl::DoGetBestSize() );
+    if (ret.x < 80) ret.x = 80;
+    ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
+    return ret;
 }
 
 #endif