X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db434467a143a2c847c4bcfe987f0202c2d02bf2..327788acc5e4915df4e9e97db7fb08a4c4a00cdd:/src/gtk/choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index dda0c63e8f..f62387d9b5 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -12,12 +12,13 @@
 #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 "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -110,18 +111,9 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
-    ApplyWidgetStyle();
-
     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 );
+    SetBestSize(size);
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
@@ -217,9 +209,31 @@ void wxChoice::Clear()
         m_strings->Clear();
 }
 
-void wxChoice::Delete( int WXUNUSED(n) )
+void wxChoice::Delete( int n )
 {
-    wxFAIL_MSG( wxT("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 dump implementation - still better than nothing
+    int i,
+        count = GetCount();
+
+    wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") );
+
+    wxArrayString items;
+    items.Alloc(count);
+    for ( i = 0; i < count; i++ )
+    {
+        if ( i != n )
+            items.Add(GetString(i));
+    }
+
+    Clear();
+
+    for ( i = 0; i < count - 1; i++ )
+    {
+        Append(items[i]);
+    }
 }
 
 int wxChoice::FindString( const wxString &string ) const
@@ -236,16 +250,18 @@ 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") );
 
-       if (string == wxString(label->label,*wxConvCurrent))
-           return count;
+        if (string == wxString(label->label,*wxConvCurrent))
+            return count;
 
-       child = child->next;
-       count++;
+        child = child->next;
+        count++;
     }
 
     return -1;
@@ -289,8 +305,10 @@ 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 , wxT("wxChoice: invalid label") );
 
@@ -344,8 +362,10 @@ void wxChoice::ApplyWidgetStyle()
 
         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 (bin->child)
+            label = bin->child;
+        if (!label)
+            label = BUTTON_CHILD(m_widget);
 
         gtk_widget_set_style( label, m_widgetStyle );
 
@@ -407,9 +427,44 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
 wxSize wxChoice::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
-    if (ret.x < 80) ret.x = 80;
-    ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
+
+    // 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;
+        }
+
+        // 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;
+
+    ret.y = 16 + gdk_char_height(GET_STYLE_FONT( m_widget->style ), 'H');
+
     return ret;
 }
 
-#endif
+#endif // wxUSE_CHOICE
+