X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2193ac9115470a4ecbc6844bbe19734a8c636ad..89b4415803685b243946e4941522be8232621fa6:/src/gtk/choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 5028a57cf0..8ccb592059 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -79,6 +79,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     }
 
     m_widget = gtk_combo_box_new_text();
+    g_object_ref(m_widget);
 
     Append(n, choices);
 
@@ -306,6 +307,20 @@ void wxChoice::SetSelection( int n )
     EnableEvents();
 }
 
+void wxChoice::SetColumns(int n)
+{
+    gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n);
+}
+
+int wxChoice::GetColumns() const
+{
+    // gtk_combo_box_get_wrap_width() was added in gtk 2.6
+    gint intval;
+    g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL);
+    return intval;
+}
+
+
 void wxChoice::DisableEvents()
 {
     g_signal_handlers_block_by_func(m_widget,
@@ -336,7 +351,7 @@ wxSize wxChoice::DoGetBestSize() const
     // in the combobox
     if ( m_widget )
     {
-        ret.x = 60;  // start with something "sensible"
+        ret.x = GetCount() > 0 ? 0 : 60;  // start with something "sensible"
         int width;
         unsigned int count = GetCount();
         for ( unsigned int n = 0; n < count; n++ )