X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e728732e976f73e9c35211871b921c9ecad60de..dc4689ef73c1046e49978fcd0a929f3dd975fbb9:/src/gtk/choice.cpp diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 8c0789964d..02b6c41b2a 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -12,7 +12,10 @@ #if wxUSE_CHOICE #include "wx/choice.h" -#include "wx/arrstr.h" + +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif // FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in // favour of GtkComboBox. @@ -130,7 +133,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); // need this too because this is a wxControlWithItems + SetInitialSize(size); // need this too because this is a wxControlWithItems return true; } @@ -596,7 +599,7 @@ wxSize wxChoice::DoGetBestSize() const return ret; } -bool wxChoice::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { return GTK_BUTTON(m_widget)->event_window; }