removed #ifdefs that conditionally included the exact same code on Mac and non-Mac...

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 7a579475c20b952dd83faea575f5dc8ffc5e9cbb..3e519a1bc0a9e15523b7714528052fdcee41e58f 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -18,10 +18,9 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
@@ -284,7 +283,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child",
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
 
-    SetBestSize(size); // need this too because this is a wxControlWithItems
+    SetInitialSize(size); // need this too because this is a wxControlWithItems
 
     // This is required for tool bar support
 //    wxSize setsize = GetSize();