summaryrefslogtreecommitdiffstats
path: root/src/device-manager.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2013-01-04 09:35:53 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2013-01-04 09:35:53 +0000
commitf3ebae385211512a9cbd727b5aa532f6aa1b711b (patch)
tree52dc68f71cc252254ffebdbcd1107d35aa9fa895 /src/device-manager.cpp
parentRe-add omitted UI pref from prefences dialog rewrite (diff)
downloadinkscape-f3ebae385211512a9cbd727b5aa532f6aa1b711b.tar.gz
inkscape-f3ebae385211512a9cbd727b5aa532f6aa1b711b.zip
ocaldialog: Use GtkSearchEntry in Gtk+ >= 3.6
(bzr r12008)
Diffstat (limited to 'src/device-manager.cpp')
-rw-r--r--src/device-manager.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index 29efa2627..a9394a5f6 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -42,12 +42,7 @@ static bool isValidDevice(GdkDevice *device)
gboolean source_matches = (gdk_device_get_source (device) == fakeout[i].source);
gboolean mode_matches = (gdk_device_get_mode (device) == fakeout[i].mode);
gboolean num_axes_matches = (gdk_device_get_n_axes (device) == fakeout[i].num_axes);
-
-#if GTK_CHECK_VERSION (2, 24, 0)
gboolean num_keys_matches = (gdk_device_get_n_keys (device) == fakeout[i].num_keys);
-#else
- gboolean num_keys_matches = (device->num_keys == fakeout[i].num_keys);
-#endif
if (name_matches && source_matches && mode_matches
&& num_axes_matches && num_keys_matches)
@@ -683,11 +678,7 @@ static void createFakeList() {
fakeout[4].mode = gdk_device_get_mode (device);
fakeout[4].has_cursor = gdk_device_get_has_cursor (device);
fakeout[4].num_axes = gdk_device_get_n_axes (device);
-#if GTK_CHECK_VERSION (2, 24, 0)
fakeout[4].num_keys = gdk_device_get_n_keys (device);
-#else
- fakeout[4].num_keys = device->num_keys;
-#endif
} else {
fakeout[4].name = g_strdup("Core Pointer");
fakeout[4].source = GDK_SOURCE_MOUSE;