implemented GetBestSize() for wxChoice

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 0106c68dff70c630ee3f930e606785098ef8c54c..ca9d9c1785bb78a7f84805ed0087adf7485bc8fb 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -407,7 +407,31 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
 wxSize wxChoice::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
 wxSize wxChoice::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );

-    if (ret.x < 80) ret.x = 80;
+
+    // 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;
 }
     ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
     return ret;
 }

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 0106c68dff70c630ee3f930e606785098ef8c54c..ca9d9c1785bb78a7f84805ed0087adf7485bc8fb 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -407,7 +407,31 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
 wxSize wxChoice::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
 wxSize wxChoice::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );

-    if (ret.x < 80) ret.x = 80;
+
+    // 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;
 }
     ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
     return ret;
 }