Avoid crash by uninitialized perspectives.

[inkscape.git] / src / desktop.h

diff --git a/src/desktop.h b/src/desktop.h
index e1479d8573fd429768fd71e55edc0b3f4c717d1a..a661d99003ad042e563d3f011b98f7a526e786b3 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -38,10 +38,7 @@
 #include "display/rendermode.h"
 #include "display/snap-indicator.h"
 
-class NRRect;
 class SPCSSAttr;
-struct _GtkWidget;
-typedef struct _GtkWidget GtkWidget;
 struct SPCanvas;
 struct SPCanvasItem;
 struct SPCanvasGroup;
@@ -180,7 +177,7 @@ struct SPDesktop : public Inkscape::UI::View::View
 #endif
 
     SPDesktop();
-    void init (SPNamedView* nv, SPCanvas* canvas);
+    void init (SPNamedView* nv, SPCanvas* canvas, Inkscape::UI::View::EditWidgetInterface *widget);
     virtual ~SPDesktop();
     void destroy();
 
@@ -201,9 +198,11 @@ struct SPDesktop : public Inkscape::UI::View::View
     void setDisplayModeOutline() {
         _setDisplayMode(Inkscape::RENDERMODE_OUTLINE);
     }
+    void setDisplayModePrintColorsPreview() {
+        _setDisplayMode(Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW);
+    }
     void displayModeToggle();
     Inkscape::RenderMode _display_mode;
-    Inkscape::RenderMode _saved_display_mode;
     Inkscape::RenderMode getMode() const { return _display_mode; }
 
     Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); }
@@ -285,6 +284,7 @@ struct SPDesktop : public Inkscape::UI::View::View
 
     void setWaitingCursor();
     void clearWaitingCursor();
+    bool isWaitingCursor() const { return waiting_cursor; };
 
     void toggleColorProfAdjust();
 
@@ -303,9 +303,6 @@ struct SPDesktop : public Inkscape::UI::View::View
     void fullscreen();
     void focusMode(bool mode = true);
 
-    void registerEditWidget (Inkscape::UI::View::EditWidgetInterface *widget)
-    { _widget = widget; }
-
     Geom::Matrix w2d() const; //transformation from window to desktop coordinates (used for zooming)
     Geom::Point w2d(Geom::Point const &p) const;
     Geom::Point d2w(Geom::Point const &p) const;