summaryrefslogtreecommitdiffstats
path: root/src/shortcuts.cpp
diff options
context:
space:
mode:
authorDenis Declara <declara91@gmail.com>2012-05-05 13:32:42 +0000
committerDenis Declara <declara91@gmail.com>2012-05-05 13:32:42 +0000
commitaeb9c1bde66de096910757abb17dedb94ad74207 (patch)
treec0adf97685b0fa8af1553b14d20601f280492762 /src/shortcuts.cpp
parentFixed some math, so that the objects now line up correctly (diff)
parentAdding checks to prevent null pointer dereferences (diff)
downloadinkscape-aeb9c1bde66de096910757abb17dedb94ad74207.tar.gz
inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.zip
Trunk merge
(bzr r11073.1.29)
Diffstat (limited to 'src/shortcuts.cpp')
-rw-r--r--src/shortcuts.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 57fc59614..07685e0e9 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -1,5 +1,3 @@
-#define __SP_SHORTCUTS_C__
-
/** \file
* Keyboard shortcut processing.
*/
@@ -40,7 +38,7 @@
#include "xml/repr.h"
#if !GTK_CHECK_VERSION(2,22,0)
-#define GDK_KEY_VoidSymbol 0xffffff
+#include "compat-key-syms.h"
#endif
using namespace Inkscape;