From 13b15b7b977eecbededd1734f5ab001f0c44d21f Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 30 Jun 2010 00:41:48 +0200 Subject: Consolidate Cairo utils in display/cairo-utils.h. Fix icons harder. (bzr r9508.1.8) --- src/display/sp-ctrlquadr.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/display/sp-ctrlquadr.cpp') diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp index b307684e5..4372f871c 100644 --- a/src/display/sp-ctrlquadr.cpp +++ b/src/display/sp-ctrlquadr.cpp @@ -11,14 +11,14 @@ * Released under GNU GPL */ -#include "display-forward.h" -#include "sp-canvas-util.h" -#include "sp-ctrlquadr.h" - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "display/inkscape-cairo.h" + +#include "display-forward.h" +#include "sp-canvas-util.h" +#include "sp-ctrlquadr.h" +#include "display/cairo-utils.h" #include "color.h" struct SPCtrlQuadr : public SPCanvasItem{ -- cgit v1.2.3 From 32cbae2ea15712efd9a36f43f7690268c1767e52 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 3 Jul 2011 11:43:53 +0100 Subject: GTK+ cleanup: gtk_type_class (bzr r10407) --- src/display/sp-ctrlquadr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/display/sp-ctrlquadr.cpp') diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp index 0701d0b10..b39886178 100644 --- a/src/display/sp-ctrlquadr.cpp +++ b/src/display/sp-ctrlquadr.cpp @@ -64,7 +64,7 @@ sp_ctrlquadr_class_init (SPCtrlQuadrClass *klass) GtkObjectClass *object_class = (GtkObjectClass *) klass; SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass; - parent_class = (SPCanvasItemClass*)gtk_type_class (SP_TYPE_CANVAS_ITEM); + parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass); object_class->destroy = sp_ctrlquadr_destroy; -- cgit v1.2.3 From ac0bc3b7583e5b45ed6ec97923170a77b5648d2e Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 14:36:15 +0200 Subject: Update 2Geom. Remove all use of NRRectL. (bzr r10582.1.3) --- src/display/sp-ctrlquadr.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/display/sp-ctrlquadr.cpp') diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp index b39886178..8cdd8170b 100644 --- a/src/display/sp-ctrlquadr.cpp +++ b/src/display/sp-ctrlquadr.cpp @@ -97,15 +97,13 @@ sp_ctrlquadr_render (SPCanvasItem *item, SPCanvasBuf *buf) { SPCtrlQuadr *cq = SP_CTRLQUADR (item); - //Geom::Rect area (Geom::Point(buf->rect.x0, buf->rect.y0), Geom::Point(buf->rect.x1, buf->rect.y1)); - if (!buf->ct) return; // RGB / BGR cairo_new_path(buf->ct); - Geom::Point min = Geom::Point(buf->rect.x0, buf->rect.y0); + Geom::Point min = buf->rect.min(); Geom::Point p1 = (cq->p1 * cq->affine) - min; Geom::Point p2 = (cq->p2 * cq->affine) - min; -- cgit v1.2.3 From c0f82d2110bcb8226efbe8435b76dcc6e0e48f70 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 4 Oct 2011 12:04:58 -0700 Subject: Cleaned up display-forward.h, including many redundant usages. (bzr r10666) --- src/display/sp-ctrlquadr.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/display/sp-ctrlquadr.cpp') diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp index 8cdd8170b..af761864c 100644 --- a/src/display/sp-ctrlquadr.cpp +++ b/src/display/sp-ctrlquadr.cpp @@ -13,7 +13,6 @@ # include "config.h" #endif -#include "display-forward.h" #include "sp-canvas-item.h" #include "sp-canvas.h" #include "sp-canvas-util.h" -- cgit v1.2.3