summaryrefslogtreecommitdiffstats
path: root/src/display/sp-canvas.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-07-23 18:09:51 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-07-23 18:09:51 +0000
commit63d5d807f1eb20be956cd33edc2a15d2dd31b5fe (patch)
treea0e3098c476106295cc63d784acaae94ce971fa1 /src/display/sp-canvas.cpp
parentTranslations. Fix for Bug #1027904 (Toolbars not translated). (diff)
downloadinkscape-63d5d807f1eb20be956cd33edc2a15d2dd31b5fe.tar.gz
inkscape-63d5d807f1eb20be956cd33edc2a15d2dd31b5fe.zip
Fix canvas scroll events in GTK+ 3
Fixed bugs: - https://launchpad.net/bugs/1016892 (bzr r11566)
Diffstat (limited to 'src/display/sp-canvas.cpp')
-rw-r--r--src/display/sp-canvas.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 4e01ada36..6d4d01e33 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1422,6 +1422,7 @@ void SPCanvasImpl::realize(GtkWidget *widget)
GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
+ GDK_SCROLL_MASK |
GDK_FOCUS_CHANGE_MASK);
#if GTK_CHECK_VERSION(3,0,0)
@@ -1557,7 +1558,10 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event)
mask = GDK_KEY_RELEASE_MASK;
break;
case GDK_SCROLL:
- mask = GDK_SCROLL;
+ mask = GDK_SCROLL_MASK;
+#if GTK_CHECK_VERSION(3,0,0)
+ mask |= GDK_SMOOTH_SCROLL_MASK;
+#endif
break;
default:
mask = 0;