X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..a0477b5a2b864a164a1012b3cfea03dc42e869ba:/src/gtk1/combobox.cpp diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 38ddd035fa..3e519a1bc0 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -14,11 +14,12 @@ #include "wx/combobox.h" -#include "wx/settings.h" -#include "wx/arrstr.h" -#include "wx/intl.h" - -#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/settings.h" + #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED + #include "wx/arrstr.h" +#endif #include "wx/gtk1/private.h" @@ -282,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();