diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/display/sp-ctrlpoint.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/display/sp-ctrlpoint.cpp')
| -rw-r--r-- | src/display/sp-ctrlpoint.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/display/sp-ctrlpoint.cpp b/src/display/sp-ctrlpoint.cpp index 3c8e2bc5d..026cc7589 100644 --- a/src/display/sp-ctrlpoint.cpp +++ b/src/display/sp-ctrlpoint.cpp @@ -23,7 +23,7 @@ static void sp_ctrlpoint_class_init (SPCtrlPointClass *klass); static void sp_ctrlpoint_init (SPCtrlPoint *ctrlpoint); -static void sp_ctrlpoint_destroy (GtkObject *object); +static void sp_ctrlpoint_destroy(SPCanvasItem *object); static void sp_ctrlpoint_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags); static void sp_ctrlpoint_render (SPCanvasItem *item, SPCanvasBuf *buf); @@ -50,16 +50,13 @@ sp_ctrlpoint_get_type (void) return type; } -static void -sp_ctrlpoint_class_init (SPCtrlPointClass *klass) +static void sp_ctrlpoint_class_init(SPCtrlPointClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass *) klass; - SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass; - - parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass); + SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass); - object_class->destroy = sp_ctrlpoint_destroy; + parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(klass)); + item_class->destroy = sp_ctrlpoint_destroy; item_class->update = sp_ctrlpoint_update; item_class->render = sp_ctrlpoint_render; } @@ -73,8 +70,7 @@ sp_ctrlpoint_init (SPCtrlPoint *ctrlpoint) ctrlpoint->radius = 2; } -static void -sp_ctrlpoint_destroy (GtkObject *object) +static void sp_ctrlpoint_destroy(SPCanvasItem *object) { g_return_if_fail (object != NULL); g_return_if_fail (SP_IS_CTRLPOINT (object)); @@ -83,8 +79,8 @@ sp_ctrlpoint_destroy (GtkObject *object) ctrlpoint->item=NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy) + (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object); } static void |