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
This commit is contained in:
@@ -34,7 +34,11 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#include <gdk/gdkkeysyms.h>
|
#include <gdk/gdkkeysyms.h>
|
||||||
|
#if GTK_CHECK_VERSION(3,0,0)
|
||||||
|
#include <gdk/gdkkeysyms-compat.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// data
|
// data
|
||||||
|
@@ -19,7 +19,11 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/gtk/private.h"
|
#include "wx/gtk/private.h"
|
||||||
|
|
||||||
#include <gdk/gdkkeysyms.h>
|
#include <gdk/gdkkeysyms.h>
|
||||||
|
#if GTK_CHECK_VERSION(3,0,0)
|
||||||
|
#include <gdk/gdkkeysyms-compat.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// wxGTKRadioButtonInfo
|
// wxGTKRadioButtonInfo
|
||||||
|
@@ -37,9 +37,14 @@
|
|||||||
|
|
||||||
#include "wx/gtk/private.h"
|
#include "wx/gtk/private.h"
|
||||||
#include "wx/gtk/private/win_gtk.h"
|
#include "wx/gtk/private/win_gtk.h"
|
||||||
#include <gdk/gdkkeysyms.h>
|
|
||||||
#include <gdk/gdkx.h>
|
#include <gdk/gdkx.h>
|
||||||
|
|
||||||
|
#include <gdk/gdkkeysyms.h>
|
||||||
|
#if GTK_CHECK_VERSION(3,0,0)
|
||||||
|
#include <gdk/gdkkeysyms-compat.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(2,10,0)
|
#if !GTK_CHECK_VERSION(2,10,0)
|
||||||
// GTK+ can reliably detect Meta key state only since 2.10 when
|
// 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
|
// GDK_META_MASK was introduced -- there wasn't any way to detect it
|
||||||
|
Reference in New Issue
Block a user