From 2bbd63d2ffc632acdaabbc078b051ee721366647 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 9 Jun 2012 15:48:20 +0100 Subject: Get rid of remaining GtkObject usage Fixed bugs: - https://launchpad.net/bugs/813212 (bzr r11473) --- src/widgets/sp-xmlview-content.cpp | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'src/widgets/sp-xmlview-content.cpp') diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp index d30f0bbe6..bf740baa0 100644 --- a/src/widgets/sp-xmlview-content.cpp +++ b/src/widgets/sp-xmlview-content.cpp @@ -25,7 +25,12 @@ using Inkscape::DocumentUndo; static void sp_xmlview_content_class_init (SPXMLViewContentClass * klass); static void sp_xmlview_content_init (SPXMLViewContent * text); -static void sp_xmlview_content_destroy (GtkObject * object); + +#if GTK_CHECK_VERSION(3,0,0) +static void sp_xmlview_content_destroy(GtkWidget * object); +#else +static void sp_xmlview_content_destroy(GtkObject * object); +#endif void sp_xmlview_content_changed (GtkTextBuffer *tb, SPXMLViewContent *text); @@ -103,16 +108,17 @@ GType sp_xmlview_content_get_type(void) return type; } -void -sp_xmlview_content_class_init (SPXMLViewContentClass * klass) +void sp_xmlview_content_class_init(SPXMLViewContentClass * klass) { - GtkObjectClass * object_class; - - object_class = (GtkObjectClass *) klass; +#if GTK_CHECK_VERSION(3,0,0) + GtkWidgetClass * widget_class = (GtkWidgetClass *) klass; + widget_class->destroy = sp_xmlview_content_destroy; +#else + GtkObjectClass * object_class = (GtkObjectClass *) klass; + object_class->destroy = sp_xmlview_content_destroy; +#endif parent_class = (GtkTextViewClass*)g_type_class_peek_parent (klass); - - object_class->destroy = sp_xmlview_content_destroy; } void @@ -122,16 +128,21 @@ sp_xmlview_content_init (SPXMLViewContent *text) text->blocked = FALSE; } -void -sp_xmlview_content_destroy (GtkObject * object) +#if GTK_CHECK_VERSION(3,0,0) +void sp_xmlview_content_destroy(GtkWidget * object) +#else +void sp_xmlview_content_destroy(GtkObject * object) +#endif { - SPXMLViewContent * text; - - text = SP_XMLVIEW_CONTENT (object); + SPXMLViewContent * text = SP_XMLVIEW_CONTENT (object); sp_xmlview_content_set_repr (text, NULL); +#if GTK_CHECK_VERSION(3,0,0) + GTK_WIDGET_CLASS (parent_class)->destroy (object); +#else GTK_OBJECT_CLASS (parent_class)->destroy (object); +#endif } void -- cgit v1.2.3 From 5da5121b9afaa8b2d1f0308dffc7d1e1b225b142 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 11 Nov 2012 12:46:25 +0000 Subject: Replace remaining C-style pointer casts for src/widgets (bzr r11868) --- src/widgets/sp-xmlview-content.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/widgets/sp-xmlview-content.cpp') diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp index bf740baa0..d31e031c2 100644 --- a/src/widgets/sp-xmlview-content.cpp +++ b/src/widgets/sp-xmlview-content.cpp @@ -46,14 +46,10 @@ static Inkscape::XML::NodeEventVector repr_events = { NULL /* order_changed */ }; -GtkWidget * -sp_xmlview_content_new (Inkscape::XML::Node * repr) +GtkWidget *sp_xmlview_content_new(Inkscape::XML::Node * repr) { - GtkTextBuffer *tb; - SPXMLViewContent *text; - - tb = gtk_text_buffer_new (NULL); - text = (SPXMLViewContent*)g_object_new (SP_TYPE_XMLVIEW_CONTENT, NULL); + GtkTextBuffer *tb = gtk_text_buffer_new(NULL); + SPXMLViewContent *text = SP_XMLVIEW_CONTENT(g_object_new(SP_TYPE_XMLVIEW_CONTENT, NULL)); gtk_text_view_set_buffer (GTK_TEXT_VIEW (text), tb); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text), GTK_WRAP_CHAR); -- cgit v1.2.3 From 8ee9827502fadcae0b02fec434799e94ee115357 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 25 Dec 2012 22:50:08 +0000 Subject: Convert a load more C-style pointer casts to GObject or C++ casts (merry christmas\!) (bzr r11986) --- src/widgets/sp-xmlview-content.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/widgets/sp-xmlview-content.cpp') diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp index d31e031c2..ac64dabdb 100644 --- a/src/widgets/sp-xmlview-content.cpp +++ b/src/widgets/sp-xmlview-content.cpp @@ -59,7 +59,7 @@ GtkWidget *sp_xmlview_content_new(Inkscape::XML::Node * repr) sp_xmlview_content_set_repr (text, repr); - return (GtkWidget *) text; + return GTK_WIDGET(text); } void @@ -107,14 +107,14 @@ GType sp_xmlview_content_get_type(void) void sp_xmlview_content_class_init(SPXMLViewContentClass * klass) { #if GTK_CHECK_VERSION(3,0,0) - GtkWidgetClass * widget_class = (GtkWidgetClass *) klass; + GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass); widget_class->destroy = sp_xmlview_content_destroy; #else - GtkObjectClass * object_class = (GtkObjectClass *) klass; + GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass); object_class->destroy = sp_xmlview_content_destroy; #endif - parent_class = (GtkTextViewClass*)g_type_class_peek_parent (klass); + parent_class = GTK_TEXT_VIEW_CLASS(g_type_class_peek_parent (klass)); } void -- cgit v1.2.3