wxToolBar support in wxUniv/wxFrame

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 97ea9be8b97dac3b73093aaa476d2a9ebcaacea8..ca9d9c1785bb78a7f84805ed0087adf7485bc8fb 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -12,10 +12,12 @@
 #pragma implementation "choice.h"
 #endif
 
-#include "wx/choice.h"
+#include "wx/defs.h"
 
 #if wxUSE_CHOICE
 
+#include "wx/choice.h"
+
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
@@ -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
@@ -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 );
 
@@ -396,7 +406,34 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
 
 wxSize wxChoice::DoGetBestSize() const
 {
-    return wxSize(80, 26);
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    // we know better our horizontal extent: it depends on the longest string
+    // we have
+    ret.x = 0;
+    if ( m_widget )
+    {
+        GdkFont *font = m_font.GetInternalFont();
+
+        wxCoord width;
+        size_t count = GetCount();
+        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;
+        }
+
+        // for the choice "=" button
+        ret.x += 20;
+    }
+
+    // but not less than the minimal width
+    if ( ret.x < 80 )
+        ret.x = 80;
+
+    ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
+    return ret;
 }
 
 #endif