Merge from Inkscape trunk.

(bzr r14668.1.3)

1 files changed, 8 insertions, 18 deletions

diff --git a/src/desktop.cpp b/src/desktop.cpp
index f099ba39f..d482d0d7f 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -111,7 +111,6 @@ SPDesktop::SPDesktop() :
     sketch( NULL ),
     controls( NULL ),
     tempgroup ( NULL ),
-    table( NULL ),
     page( NULL ),
     page_border( NULL ),
     current( NULL ),
@@ -211,11 +210,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid
     g_signal_connect (G_OBJECT (main), "event", G_CALLBACK (sp_desktop_root_handler), this);
 
     /* This is the background the page sits on. */
-    table = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL);
-    SP_CTRLRECT(table)->setRectangle(Geom::Rect(Geom::Point(-80000, -80000), Geom::Point(80000, 80000)));
-    SP_CTRLRECT(table)->setColor(0x00000000, true, 0x00000000);
-    SP_CTRLRECT(table)->setCheckerboard( false );
-    sp_canvas_item_move_to_z (table, 0);
+    canvas->setBackgroundColor(0xffffff00);
 
     page = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL);
     ((CtrlRect *) page)->setColor(0x00000000, FALSE, 0x00000000);
@@ -501,7 +496,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 +517,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() );
@@ -1446,7 +1441,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);
@@ -1732,17 +1728,11 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop)
     SPNamedView *nv=SP_NAMEDVIEW(obj);
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
-
-        /* Set page background */
-        sp_canvas_item_show (desktop->table);
         if (nv->pagecheckerboard) {
-            ((CtrlRect *) desktop->table)->setCheckerboard( true );
-            ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor ); // | 0xff);
+            desktop->canvas->setBackgroundCheckerboard();
         } else {
-            ((CtrlRect *) desktop->table)->setCheckerboard( false );
-            ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff);
+            desktop->canvas->setBackgroundColor(nv->pagecolor);
         }
-        sp_canvas_item_move_to_z (desktop->table, 0);
 
         /* Show/hide page border */
         if (nv->showborder) {
@@ -1755,7 +1745,7 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop)
             }
             // place in the z-order stack
             if (nv->borderlayer == SP_BORDER_LAYER_BOTTOM) {
-                 sp_canvas_item_move_to_z (desktop->page_border, 2);
+                 sp_canvas_item_move_to_z (desktop->page_border, 1);
             } else {
                 int order = sp_canvas_item_order (desktop->page_border);
                 int morder = sp_canvas_item_order (desktop->drawing);