summaryrefslogtreecommitdiffstats
path: root/src/device-manager.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-12-04 09:51:15 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-12-04 09:51:15 +0000
commit2c6e21d9fd3945a73b3ed5d04a87fb16a90f7a8e (patch)
tree52a0994d8a30aaa8f867073d1cd9ce575f490de8 /src/device-manager.cpp
parentchanges_2012-11_28.patch (diff)
parentwix installer: create msi filename from version sing in src/inkscape.rc, add ... (diff)
downloadinkscape-2c6e21d9fd3945a73b3ed5d04a87fb16a90f7a8e.tar.gz
inkscape-2c6e21d9fd3945a73b3ed5d04a87fb16a90f7a8e.zip
merge from trunk (r11929)
[win32] Please update to latest devlibs for Windows (r41) (bzr r11668.1.44)
Diffstat (limited to 'src/device-manager.cpp')
-rw-r--r--src/device-manager.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index 5c7048613..29efa2627 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -173,14 +173,7 @@ public:
virtual bool hasCursor() const {return gdk_device_get_has_cursor (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
+ return gdk_device_get_n_keys (device);
}
virtual Glib::ustring getLink() const {return link;}
virtual void setLink( Glib::ustring const& link ) {this->link = link;}