diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-09 14:48:20 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-09 14:48:20 +0000 |
| commit | 2bbd63d2ffc632acdaabbc078b051ee721366647 (patch) | |
| tree | b550ce556623952cd4b15f084ba0669f88f27285 /src/widgets/sp-xmlview-tree.cpp | |
| parent | Drop GtkObject usage in gradient-vector (diff) | |
| download | inkscape-2bbd63d2ffc632acdaabbc078b051ee721366647.tar.gz inkscape-2bbd63d2ffc632acdaabbc078b051ee721366647.zip | |
Get rid of remaining GtkObject usage
Fixed bugs:
- https://launchpad.net/bugs/813212
(bzr r11473)
Diffstat (limited to 'src/widgets/sp-xmlview-tree.cpp')
| -rw-r--r-- | src/widgets/sp-xmlview-tree.cpp | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp index aafd4ab79..dda72cbe1 100644 --- a/src/widgets/sp-xmlview-tree.cpp +++ b/src/widgets/sp-xmlview-tree.cpp @@ -27,7 +27,12 @@ enum { STORE_TEXT_COL = 0, STORE_DATA_COL, STORE_REPR_COL, STORE_N_COLS }; static void sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass); static void sp_xmlview_tree_init (SPXMLViewTree * tree); -static void sp_xmlview_tree_destroy (GtkObject * object); + +#if GTK_CHECK_VERSION(3,0,0) +static void sp_xmlview_tree_destroy(GtkWidget * object); +#else +static void sp_xmlview_tree_destroy(GtkObject * object); +#endif static NodeData * node_data_new (SPXMLViewTree * tree, GtkTreeIter * node, GtkTreeRowReference *rowref, Inkscape::XML::Node * repr); static void node_data_free (gpointer data); @@ -143,13 +148,17 @@ sp_xmlview_tree_get_type (void) return type; } -void -sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass) +void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass) { - GtkObjectClass * object_class; - - object_class = (GtkObjectClass *) klass; - parent_class = (GtkTreeViewClass *) g_type_class_peek_parent (klass); +#if GTK_CHECK_VERSION(3,0,0) + GtkWidgetClass * widget_class = (GtkWidgetClass *) klass; + widget_class->destroy = sp_xmlview_tree_destroy; +#else + GtkObjectClass * object_class = (GtkObjectClass *) klass; + object_class->destroy = sp_xmlview_tree_destroy; +#endif + + parent_class = (GtkTreeViewClass *) g_type_class_peek_parent (klass); // Signal for when a tree drag and drop has completed g_signal_new ( "tree_move", @@ -160,8 +169,6 @@ sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass) g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); - - object_class->destroy = sp_xmlview_tree_destroy; } void @@ -172,16 +179,22 @@ sp_xmlview_tree_init (SPXMLViewTree * tree) tree->dndactive = FALSE; } -void -sp_xmlview_tree_destroy (GtkObject * object) -{ - SPXMLViewTree * tree; - tree = SP_XMLVIEW_TREE (object); +#if GTK_CHECK_VERSION(3,0,0) +void sp_xmlview_tree_destroy(GtkWidget * object) +#else +void sp_xmlview_tree_destroy(GtkObject * object) +#endif +{ + SPXMLViewTree * tree = SP_XMLVIEW_TREE (object); sp_xmlview_tree_set_repr (tree, NULL); - GTK_OBJECT_CLASS (parent_class)->destroy (object); +#if GTK_CHECK_VERSION(3,0,0) + GTK_WIDGET_CLASS(parent_class)->destroy (object); +#else + GTK_OBJECT_CLASS(parent_class)->destroy (object); +#endif } /* |