X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop-handles.h;h=74001d8907764ebb817aba0f07bf032ed0fd6387;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=0a7e5e7be2446bdb09e2f7d442734937325574a0;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/desktop-handles.h b/src/desktop-handles.h
index 0a7e5e7be..74001d890 100644
--- a/src/desktop-handles.h
+++ b/src/desktop-handles.h
@@ -13,35 +13,23 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/display-forward.h"
 #include "forward.h"
 
+struct SPCanvas;
+struct SPCanvasItem;
+struct SPCanvasGroup;
+
 namespace Inkscape { 
     class MessageStack;
     class Selection; 
 }
 
-#define SP_DESKTOP_SCROLL_LIMIT 4000.0
 #define SP_DESKTOP_ZOOM_MAX 256.0
 #define SP_DESKTOP_ZOOM_MIN 0.01
 
 #define SP_COORDINATES_UNDERLINE_NONE (0)
-#define SP_COORDINATES_UNDERLINE_X (1 << NR::X)
-#define SP_COORDINATES_UNDERLINE_Y (1 << NR::Y)
-
-#define SP_DT_EVENTCONTEXT(d) sp_desktop_event_context (d)
-#define SP_DT_SELECTION(d) sp_desktop_selection (d)
-#define SP_DT_DOCUMENT(d) sp_desktop_document (d)
-#define SP_DT_CANVAS(d) sp_desktop_canvas (d)
-#define SP_DT_ACETATE(d) sp_desktop_acetate (d)
-#define SP_DT_MAIN(d) sp_desktop_main (d)
-#define SP_DT_GRID(d) sp_desktop_grid (d)
-#define SP_DT_GUIDES(d) sp_desktop_guides (d)
-#define SP_DT_DRAWING(d) sp_desktop_drawing (d)
-#define SP_DT_SKETCH(d) sp_desktop_sketch (d)
-#define SP_DT_CONTROLS(d) sp_desktop_controls (d)
-#define SP_DT_MSGSTACK(d) sp_desktop_message_stack (d)
-#define SP_DT_NAMEDVIEW(d) sp_desktop_namedview (d)
+#define SP_COORDINATES_UNDERLINE_X (1 << Geom::X)
+#define SP_COORDINATES_UNDERLINE_Y (1 << Geom::Y)
 
 SPEventContext * sp_desktop_event_context (SPDesktop const * desktop);
 Inkscape::Selection * sp_desktop_selection (SPDesktop const * desktop);
@@ -49,11 +37,12 @@ SPDocument * sp_desktop_document (SPDesktop const * desktop);
 SPCanvas * sp_desktop_canvas (SPDesktop const * desktop);
 SPCanvasItem * sp_desktop_acetate (SPDesktop const * desktop);
 SPCanvasGroup * sp_desktop_main (SPDesktop const * desktop);
-SPCanvasGroup * sp_desktop_grid (SPDesktop const * desktop);
+SPCanvasGroup * sp_desktop_gridgroup (SPDesktop const * desktop);
 SPCanvasGroup * sp_desktop_guides (SPDesktop const * desktop);
 SPCanvasItem *sp_desktop_drawing (SPDesktop const *desktop);
 SPCanvasGroup * sp_desktop_sketch (SPDesktop const * desktop);
 SPCanvasGroup * sp_desktop_controls (SPDesktop const * desktop);
+SPCanvasGroup * sp_desktop_tempgroup (SPDesktop const * desktop);
 Inkscape::MessageStack * sp_desktop_message_stack (SPDesktop const * desktop);
 SPNamedView * sp_desktop_namedview (SPDesktop const * desktop);
 
@@ -68,4 +57,4 @@ SPNamedView * sp_desktop_namedview (SPDesktop const * desktop);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :