diff options
Diffstat (limited to 'src/display/sodipodi-ctrl.h')
| -rw-r--r-- | src/display/sodipodi-ctrl.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h index a708ad41b..2617e7db2 100644 --- a/src/display/sodipodi-ctrl.h +++ b/src/display/sodipodi-ctrl.h @@ -7,17 +7,16 @@ * */ -#include <gtk/gtkenums.h> +#include <gtk/gtk.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <libnr/nr-rect-l.h> #include "sp-canvas-item.h" #define SP_TYPE_CTRL (sp_ctrl_get_type ()) -#define SP_CTRL(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_CTRL, SPCtrl)) -#define SP_CTRL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), SP_TYPE_CTRL, SPCtrlClass)) -#define SP_IS_CTRL(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_CTRL)) -#define SP_IS_CTRL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SP_TYPE_CTRL)) +#define SP_CTRL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRL, SPCtrl)) +#define SP_CTRL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_CTRL, SPCtrlClass)) +#define SP_IS_CTRL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_CTRL)) +#define SP_IS_CTRL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_CTRL)) typedef enum { SP_CTRL_SHAPE_SQUARE, @@ -48,8 +47,8 @@ struct SPCtrl : public SPCanvasItem { guint32 stroke_color; bool _moved; - NRRectL box; /* NB! x1 & y1 are included */ - guchar *cache; + Geom::IntRect box; /* NB! x1 & y1 are included */ + guint32 *cache; GdkPixbuf * pixbuf; void moveto(Geom::Point const p); @@ -62,7 +61,7 @@ struct SPCtrlClass : public SPCanvasItemClass{ /* Standard Gtk function */ -GtkType sp_ctrl_get_type (void); +GType sp_ctrl_get_type (void); #endif /* !INKSCAPE_CTRL_H */ |