Fix change in revision 9947 to be consistent with rest of the codebase.

[inkscape.git] / src / desktop-handles.h

diff --git a/src/desktop-handles.h b/src/desktop-handles.h
index 3633ef1f00f4eb36aab64f476aff73e6d68400f6..61ea43d1e5cd206b2c6cf371962b39eca6673155 100644 (file)
--- a/src/desktop-handles.h
+++ b/src/desktop-handles.h
@@ -21,13 +21,12 @@ namespace Inkscape {
     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_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);
@@ -35,11 +34,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);
 
@@ -54,4 +54,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 :