Fixed a few warnings and hardcoded PANGO_GLYPH_* constants

[inkscape.git] / src / desktop.h

diff --git a/src/desktop.h b/src/desktop.h
index 8e31e2e7dab590b85a3de3b47b9bf0c8525f0463..948fd53bc304a4310a04402eb751001917045f42 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -9,7 +9,9 @@
  *   Frank Felfe <innerspace@iname.com>
  *   bulia byak <buliabyak@users.sf.net>
  *   Ralf Stephan <ralf@ark.in-berlin.de>
+ *   John Bintz <jcoswell@coswellproductions.org>
  *
+ * Copyright (C) 2006 John Bintz
  * Copyright (C) 1999-2005 authors
  * Copyright (C) 2000-2001 Ximian, Inc.
  *
@@ -50,6 +52,7 @@ namespace Inkscape {
   class Selection; 
   class ObjectHierarchy;
   class LayerManager;
+  class EventLog;
   namespace UI { 
       namespace Dialog { 
           class DialogManager; 
@@ -74,6 +77,7 @@ struct SPDesktop : public Inkscape::UI::View::View
     Inkscape::Selection       *selection;
     SPEventContext            *event_context;
     Inkscape::LayerManager    *layer_manager;
+    Inkscape::EventLog        *event_log;
 
     SPCanvasItem  *acetate;
     SPCanvasGroup *main;
@@ -92,6 +96,7 @@ struct SPDesktop : public Inkscape::UI::View::View
     unsigned int dkey;
     unsigned int number;
     bool is_fullscreen;
+    unsigned int interaction_disabled_counter;
 
     /// \todo fixme: This has to be implemented in different way */
     guint guides_active : 1;
@@ -224,6 +229,10 @@ struct SPDesktop : public Inkscape::UI::View::View
     void setToolboxAdjustmentValue (gchar const* id, double val);
     bool isToolboxButtonActive (gchar const *id);
     void updateNow();
+    void updateCanvasNow();
+    
+    void enableInteraction();
+    void disableInteraction();
     
     void fullscreen();
 
@@ -266,6 +275,7 @@ private:
     sigc::connection _reconstruction_start_connection;
     sigc::connection _reconstruction_finish_connection;
     sigc::connection _commit_connection;
+    sigc::connection _modified_connection;
     
     virtual void onPositionSet (double, double);
     virtual void onResized (double, double);