From 7acb88bc149adabcd57d71e733aabdf3fcb898f8 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 18 Sep 2008 21:10:10 +0000 Subject: Yet another NR ==> Geom change (bzr r6840) --- src/desktop-events.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/desktop-events.cpp') diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index f839b6946..726341ded 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -78,7 +78,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge Inkscape::XML::Node *repr = SP_OBJECT_REPR(desktop->namedview); gdk_window_get_pointer(GTK_WIDGET(dtw->canvas)->window, &wx, &wy, NULL); - NR::Point const event_win(wx, wy); + Geom::Point const event_win(wx, wy); gint width, height; gdk_window_get_geometry(GTK_WIDGET(dtw->canvas)->window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/); @@ -87,8 +87,8 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge case GDK_BUTTON_PRESS: if (event->button.button == 1) { dragging = true; - NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win)); - NR::Point const event_dt(desktop->w2d(event_w)); + Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win)); + Geom::Point const event_dt(desktop->w2d(event_w)); // explicitly show guidelines; if I draw a guide, I want them on sp_repr_set_boolean(repr, "showguides", TRUE); @@ -139,7 +139,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge break; case GDK_MOTION_NOTIFY: if (dragging) { - NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win)); + Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win)); Geom::Point event_dt(desktop->w2d(event_w)); SnapManager &m = desktop->namedview->snap_manager; @@ -154,7 +154,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge case GDK_BUTTON_RELEASE: if (dragging && event->button.button == 1) { gdk_pointer_ungrab(event->button.time); - NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win)); + Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win)); Geom::Point event_dt(desktop->w2d(event_w)); SnapManager &m = desktop->namedview->snap_manager; @@ -255,8 +255,8 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) case GDK_BUTTON_RELEASE: if (dragging && event->button.button == 1) { if (moved) { - NR::Point const event_w(event->button.x, - event->button.y); + Geom::Point const event_w(event->button.x, + event->button.y); Geom::Point event_dt(desktop->w2d(event_w)); SnapManager &m = desktop->namedview->snap_manager; -- cgit v1.2.3