X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..8930b2ed1ebff50797843db75744c6963287dbe7:/src/gtk/choice.cpp diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 011468f47e..737522f7ad 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. @@ -483,10 +486,6 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) } } -#ifdef __VMS -#pragma message disable unscomzer -#endif - int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item) { wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index")); @@ -555,10 +554,6 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& it return index; } -#ifdef __VMS -#pragma message enable unscomzer -#endif - wxSize wxChoice::DoGetBestSize() const { wxSize ret( wxControl::DoGetBestSize() ); @@ -604,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; }