From 7eb4eab95f297feea0d4106d5b6d4a8d9fdedb86 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 11 Apr 2016 15:42:13 +0100 Subject: desktop: Fix deprecated GdkCursor API (bzr r14779) --- src/desktop.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index f099ba39f..84a578ee9 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1446,7 +1446,8 @@ void SPDesktop::disableInteraction() void SPDesktop::setWaitingCursor() { - GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); + GdkDisplay *display = gdk_display_get_default(); + GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(getCanvas())), waiting); #if GTK_CHECK_VERSION(3,0,0) g_object_unref(waiting); -- cgit v1.2.3 From a907096a990015010ec1171cd8997d33951f28a2 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 12 Apr 2016 11:35:15 +0100 Subject: Hackfest 2016: un-obfuscate the SPCanvas widget. (bzr r14790) --- src/desktop.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 84a578ee9..331ab3351 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -501,7 +501,7 @@ void SPDesktop::redrawDesktop() { void SPDesktop::_setDisplayMode(Inkscape::RenderMode mode) { SP_CANVAS_ARENA (drawing)->drawing.setRenderMode(mode); - canvas->rendermode = mode; + canvas->_rendermode = mode; _display_mode = mode; redrawDesktop(); _widget->setTitle( this->getDocument()->getName() ); @@ -522,7 +522,7 @@ void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) { } SP_CANVAS_ARENA (drawing)->drawing.setColorMode(mode); - canvas->colorrendermode = mode; + canvas->_colorrendermode = mode; _display_color_mode = mode; redrawDesktop(); _widget->setTitle( this->getDocument()->getName() ); -- cgit v1.2.3