diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-09 17:46:22 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@googlemail.com> | 2012-04-09 17:46:22 +0000 |
| commit | dd9de5de1c9ad49810ca7bdddd22240e72c1a33f (patch) | |
| tree | 6ca5b8a4ce603537ebc47a7f5551430c6015e5d4 /src/desktop-events.cpp | |
| parent | Replace deprecated gdk_cursor_unref (diff) | |
| download | inkscape-dd9de5de1c9ad49810ca7bdddd22240e72c1a33f.tar.gz inkscape-dd9de5de1c9ad49810ca7bdddd22240e72c1a33f.zip | |
Replace deprecated gdk_window_get_pointer
(bzr r11197)
Diffstat (limited to 'src/desktop-events.cpp')
| -rw-r--r-- | src/desktop-events.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index ae198f5c1..b16cebee2 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -84,12 +84,18 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge int wx, wy; SPDesktop *desktop = dtw->desktop; + GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(dtw->canvas)); - gdk_window_get_pointer(gtk_widget_get_window (GTK_WIDGET(dtw->canvas)), &wx, &wy, NULL); +#if GTK_CHECK_VERSION(3,0,0) + GdkDisplay *display = gdk_window_get_display(window); + gdk_window_get_device_position(window, display->core_pointer, &wx, &wy, NULL); +#else + gdk_window_get_pointer(window, &wx, &wy, NULL); +#endif Geom::Point const event_win(wx, wy); gint width, height; - gdk_window_get_geometry(gtk_widget_get_window (GTK_WIDGET(dtw->canvas)), NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/); + gdk_window_get_geometry(window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/); switch (event->type) { case GDK_BUTTON_PRESS: |