*** empty log message ***

[wxWidgets.git] / src / gtk / combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 32b082064a4a9887246bc628c15cafcf92132d9c..3f8b535c07aea54202ea68115b68104ee5d82ffd 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -101,7 +101,15 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
-    if (!PreCreation( parent, pos, size ) ||
+    wxSize newSize( size );
+    if (newSize.x == -1)
+       newSize.x = 80;
+    if (newSize.y == -1)
+       newSize.y = 26;
+    if (newSize.y > 30)
+       newSize.y = 30;
+       
+    if (!PreCreation( parent, pos, newSize ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxComboBox creation failed") );
@@ -113,8 +121,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     // make it more useable
     gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
 
-    SetSizeOrDefault( size );
-
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
     for (int i = 0; i < n; i++)