From 87c21824e16be951d9cf61e8b6b33b18f417214d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 3 Jan 2012 20:51:51 +0000 Subject: Backward compatibility: gdk_device_get_n_keys needs GTK 2.24 (bzr r10832) --- src/device-manager.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/device-manager.cpp') diff --git a/src/device-manager.cpp b/src/device-manager.cpp index 7d3bdc635..e5864e84b 100644 --- a/src/device-manager.cpp +++ b/src/device-manager.cpp @@ -144,7 +144,16 @@ public: virtual Gdk::InputMode getMode() const {return static_cast(gdk_device_get_mode (device));} virtual bool hasCursor() const {return gdk_device_get_has_cursor (device);} virtual gint getNumAxes() const {return gdk_device_get_n_axes (device);} - virtual gint getNumKeys() const {return gdk_device_get_n_keys (device);} + virtual gint getNumKeys() const { +// Backward-compatibility: The GSEAL-compliant +// gdk_device_get_n_keys function was only introduced +// with GTK 2.24 +#if GTK_CHECK_VERSION(2, 24, 0) + return gdk_device_get_n_keys (device); +#else + return device->num_keys; +#endif // GTK_CHECK_VERSION + } virtual Glib::ustring getLink() const {return link;} virtual void setLink( Glib::ustring const& link ) {this->link = link;} virtual gint getLiveAxes() const {return liveAxes;} -- cgit v1.2.3