From 14b44999eb335f3fc84b4362980b1730b8887588 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 6 Mar 2011 18:22:23 +0000 Subject: [PATCH] Include gdk/gdkkeysyms-compat.h. GTK+ 2.22 changed GDK_* keysym constants to GDK_KEY_* and introduced a new header for the old names. This header must be explicitly included in GTK+ 3, so do it for now. In the long run, we should migrate to the new names. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/listbox.cpp | 4 ++++ src/gtk/radiobox.cpp | 4 ++++ src/gtk/window.cpp | 7 ++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 9a40618..d62d0bf 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -34,7 +34,11 @@ #endif #include + #include +#if GTK_CHECK_VERSION(3,0,0) +#include +#endif //----------------------------------------------------------------------------- // data diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 3467b72..0f0c535 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -19,7 +19,11 @@ #endif #include "wx/gtk/private.h" + #include +#if GTK_CHECK_VERSION(3,0,0) +#include +#endif //----------------------------------------------------------------------------- // wxGTKRadioButtonInfo diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 85c1dfc..3c32e7d 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -37,9 +37,14 @@ #include "wx/gtk/private.h" #include "wx/gtk/private/win_gtk.h" -#include + #include +#include +#if GTK_CHECK_VERSION(3,0,0) +#include +#endif + #if !GTK_CHECK_VERSION(2,10,0) // GTK+ can reliably detect Meta key state only since 2.10 when // GDK_META_MASK was introduced -- there wasn't any way to detect it -- 2.7.4