GTK+ cleaning: gtk_type_new

(bzr r10390.1.3)

18 files changed, 28 insertions, 49 deletions

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 0d56b0175..ecc3051cc 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -177,7 +177,7 @@ sp_canvas_item_new (SPCanvasGroup *parent, GType type, gchar const *first_arg_na
     g_return_val_if_fail (SP_IS_CANVAS_GROUP (parent), NULL);
     g_return_val_if_fail (gtk_type_is_a (type, sp_canvas_item_get_type ()), NULL);
 
-    SPCanvasItem *item = SP_CANVAS_ITEM (gtk_type_new (type));
+    SPCanvasItem *item = SP_CANVAS_ITEM (g_object_new (type, NULL));
 
     va_start (args, first_arg_name);
     sp_canvas_item_construct (item, parent, first_arg_name, args);
@@ -1025,7 +1025,7 @@ sp_canvas_init (SPCanvas *canvas)
     canvas->pick_event.crossing.y = 0;
 
     /* Create the root item as a special case */
-    canvas->root = SP_CANVAS_ITEM (gtk_type_new (sp_canvas_group_get_type ()));
+    canvas->root = SP_CANVAS_ITEM (g_object_new (sp_canvas_group_get_type (), NULL));
     canvas->root->canvas = canvas;
 
     gtk_object_ref (GTK_OBJECT (canvas->root));
@@ -1125,7 +1125,7 @@ static void track_latency(GdkEvent const *event) {
 GtkWidget *
 sp_canvas_new_aa (void)
 {
-    SPCanvas *canvas = (SPCanvas *)gtk_type_new (sp_canvas_get_type ());
+    SPCanvas *canvas = (SPCanvas *)g_object_new (sp_canvas_get_type (), NULL);
 
     return (GtkWidget *) canvas;
 }
@@ -1464,9 +1464,6 @@ pick_current_item (SPCanvas *canvas, GdkEvent *event)
         && (canvas->current_item != NULL)
         && !canvas->left_grabbed_item) {
         GdkEvent new_event;
-        SPCanvasItem *item;
-
-        item = canvas->current_item;
 
         new_event = canvas->pick_event;
         new_event.type = GDK_LEAVE_NOTIFY;
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index dc65c3d14..4b72a7566 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -79,12 +79,7 @@ GType sp_unit_selector_get_type(void)
 static void
 sp_unit_selector_class_init(SPUnitSelectorClass *klass)
 {
-    GObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-
-    object_class = G_OBJECT_CLASS(klass);
-    widget_class = GTK_WIDGET_CLASS(klass);
-
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
     unit_selector_parent_class = (GtkHBoxClass*)gtk_type_class(GTK_TYPE_HBOX);
 
     signals[SET_UNIT] = g_signal_new("set_unit",
@@ -138,7 +133,7 @@ sp_unit_selector_finalize(GObject *object)
 GtkWidget *
 sp_unit_selector_new(guint bases)
 {
-    SPUnitSelector *us = (SPUnitSelector*)gtk_type_new(SP_TYPE_UNIT_SELECTOR);
+    SPUnitSelector *us = (SPUnitSelector*)g_object_new(SP_TYPE_UNIT_SELECTOR, NULL);
 
     sp_unit_selector_set_bases(us, bases);
 
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp
index 639216d1f..333875550 100644
--- a/src/svg-view-widget.cpp
+++ b/src/svg-view-widget.cpp
@@ -212,7 +212,7 @@ sp_svg_view_widget_new (SPDocument *doc)
 
 	g_return_val_if_fail (doc != NULL, NULL);
 
-	widget = (GtkWidget*)gtk_type_new (SP_TYPE_SVG_VIEW_WIDGET);
+	widget = (GtkWidget*)g_object_new (SP_TYPE_SVG_VIEW_WIDGET, NULL);
 
 	reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (widget))->setDocument (doc);
 
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 965910ba2..eee0113c8 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -391,7 +391,7 @@ static void sp_font_selector_emit_set (SPFontSelector *fsel)
 
 GtkWidget *sp_font_selector_new()
 {
-    SPFontSelector *fsel = (SPFontSelector*) gtk_type_new(SP_TYPE_FONT_SELECTOR);
+    SPFontSelector *fsel = (SPFontSelector*) g_object_new(SP_TYPE_FONT_SELECTOR, NULL);
 
     return (GtkWidget *) fsel;
 }
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index eb4ab789d..37f74997d 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -144,7 +144,7 @@ sp_gradient_image_new (SPGradient *gradient)
 {
 	SPGradientImage *image;
 
-	image = (SPGradientImage*)gtk_type_new (SP_TYPE_GRADIENT_IMAGE);
+	image = (SPGradientImage*)g_object_new (SP_TYPE_GRADIENT_IMAGE, NULL);
 
 	sp_gradient_image_set_gradient (image, gradient);
 
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index c6b867595..0b7764674 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -212,7 +212,7 @@ sp_gradient_selector_new (void)
 {
     SPGradientSelector *sel;
 
-    sel = (SPGradientSelector*)gtk_type_new (SP_TYPE_GRADIENT_SELECTOR);
+    sel = (SPGradientSelector*)g_object_new (SP_TYPE_GRADIENT_SELECTOR, NULL);
 
     return (GtkWidget *) sel;
 }
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 310002b54..63d4bcee0 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -165,7 +165,7 @@ GtkWidget *sp_gradient_vector_selector_new(SPDocument *doc, SPGradient *gr)
     g_return_val_if_fail(!gr || SP_IS_GRADIENT(gr), NULL);
     g_return_val_if_fail(!gr || (gr->document == doc), NULL);
 
-    gvs = static_cast<GtkWidget*>(gtk_type_new(SP_TYPE_GRADIENT_VECTOR_SELECTOR));
+    gvs = static_cast<GtkWidget*>(g_object_new(SP_TYPE_GRADIENT_VECTOR_SELECTOR, NULL));
 
     if (doc) {
         sp_gradient_vector_selector_set_gradient(SP_GRADIENT_VECTOR_SELECTOR(gvs), doc, gr);
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index fa4684825..4baabdfd9 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -156,11 +156,7 @@ GType sp_paint_selector_get_type(void)
 static void
 sp_paint_selector_class_init(SPPaintSelectorClass *klass)
 {
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-
-    object_class = (GtkObjectClass *) klass;
-    widget_class = (GtkWidgetClass *) klass;
+    GtkObjectClass *object_class = (GtkObjectClass *) klass;
 
     parent_class = (GtkVBoxClass*)gtk_type_class(GTK_TYPE_VBOX);
 
@@ -352,7 +348,7 @@ sp_paint_selector_show_fillrule(SPPaintSelector *psel, bool is_fill)
 
 SPPaintSelector *sp_paint_selector_new(FillOrStroke kind)
 {
-    SPPaintSelector *psel = static_cast<SPPaintSelector*>(gtk_type_new(SP_TYPE_PAINT_SELECTOR));
+    SPPaintSelector *psel = static_cast<SPPaintSelector*>(g_object_new(SP_TYPE_PAINT_SELECTOR, NULL));
 
     psel->setMode(SPPaintSelector::MODE_MULTIPLE);
 
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index f3f4164a5..7744f5433 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -91,7 +91,7 @@ sp_hruler_init (SPHRuler *hruler)
 GtkWidget*
 sp_hruler_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (sp_hruler_get_type ()));
+  return GTK_WIDGET (g_object_new (sp_hruler_get_type (), NULL));
 }
 
 static gint
@@ -179,7 +179,7 @@ sp_vruler_init (SPVRuler *vruler)
 GtkWidget*
 sp_vruler_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (sp_vruler_get_type ()));
+  return GTK_WIDGET (g_object_new (sp_vruler_get_type (), NULL));
 }
 
 
@@ -212,8 +212,7 @@ static void
 sp_ruler_common_draw_ticks (GtkRuler *ruler)
 {
     GtkWidget *widget;
-    GdkGC *gc, *bg_gc;
-    PangoFontDescription *pango_desc;
+    GdkGC *gc;
     PangoContext *pango_context;
     PangoLayout *pango_layout;
     gint i, j, tick_index;
@@ -242,9 +241,7 @@ sp_ruler_common_draw_ticks (GtkRuler *ruler)
     g_object_get(G_OBJECT(ruler), "orientation", &orientation, NULL);
     widget = GTK_WIDGET (ruler);
     gc = widget->style->fg_gc[GTK_STATE_NORMAL];
-    bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];
 
-    pango_desc = widget->style->font_desc;
     pango_context = gtk_widget_get_pango_context (widget);
     pango_layout = pango_layout_new (pango_context);
     PangoFontDescription *fs = pango_font_description_new ();
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 61863f31b..494a9997b 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -67,11 +67,9 @@ static void
 sp_attribute_widget_class_init (SPAttributeWidgetClass *klass)
 {
     GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
     GtkEditableClass *editable_class;
 
     object_class = GTK_OBJECT_CLASS (klass);
-    widget_class = GTK_WIDGET_CLASS (klass);
     editable_class = GTK_EDITABLE_CLASS (klass);
 
     parent_class = (GtkEntryClass*)gtk_type_class (GTK_TYPE_ENTRY);
@@ -177,7 +175,7 @@ sp_attribute_widget_new ( SPObject *object, const gchar *attribute )
     g_return_val_if_fail (!object || SP_IS_OBJECT (object), NULL);
     g_return_val_if_fail (!object || attribute, NULL);
 
-    spaw = (SPAttributeWidget*)gtk_type_new (SP_TYPE_ATTRIBUTE_WIDGET);
+    spaw = (SPAttributeWidget*)g_object_new (SP_TYPE_ATTRIBUTE_WIDGET, NULL);
 
     sp_attribute_widget_set_object (spaw, object, attribute);
 
@@ -192,7 +190,7 @@ sp_attribute_widget_new_repr ( Inkscape::XML::Node *repr, const gchar *attribute
 {
     SPAttributeWidget *spaw;
 
-    spaw = (SPAttributeWidget*)gtk_type_new (SP_TYPE_ATTRIBUTE_WIDGET);
+    spaw = (SPAttributeWidget*)g_object_new (SP_TYPE_ATTRIBUTE_WIDGET, NULL);
 
     sp_attribute_widget_set_repr (spaw, repr, attribute);
 
@@ -385,11 +383,7 @@ GType sp_attribute_table_get_type(void)
 static void
 sp_attribute_table_class_init (SPAttributeTableClass *klass)
 {
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-
-    object_class = GTK_OBJECT_CLASS (klass);
-    widget_class = GTK_WIDGET_CLASS (klass);
+    GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
 
     table_parent_class = (GtkVBoxClass*)gtk_type_class (GTK_TYPE_VBOX);
 
@@ -472,7 +466,7 @@ sp_attribute_table_new ( SPObject *object,
     g_return_val_if_fail (!object || (num_attr > 0), NULL);
     g_return_val_if_fail (!num_attr || (labels && attributes), NULL);
 
-    spat = (SPAttributeTable*)gtk_type_new (SP_TYPE_ATTRIBUTE_TABLE);
+    spat = (SPAttributeTable*)g_object_new (SP_TYPE_ATTRIBUTE_TABLE, NULL);
 
     sp_attribute_table_set_object (spat, object, num_attr, labels, attributes);
 
@@ -492,7 +486,7 @@ sp_attribute_table_new_repr ( Inkscape::XML::Node *repr,
 
     g_return_val_if_fail (!num_attr || (labels && attributes), NULL);
 
-    spat = (SPAttributeTable*)gtk_type_new (SP_TYPE_ATTRIBUTE_TABLE);
+    spat = (SPAttributeTable*)g_object_new (SP_TYPE_ATTRIBUTE_TABLE, NULL);
 
     sp_attribute_table_set_repr (spat, repr, num_attr, labels, attributes);
 
diff --git a/src/widgets/sp-color-gtkselector.cpp b/src/widgets/sp-color-gtkselector.cpp
index 10254321a..60a63d8c4 100644
--- a/src/widgets/sp-color-gtkselector.cpp
+++ b/src/widgets/sp-color-gtkselector.cpp
@@ -113,7 +113,7 @@ sp_color_gtkselector_new( GType )
 {
 	SPColorGtkselector *csel;
 
-	csel = (SPColorGtkselector*)gtk_type_new (SP_TYPE_COLOR_GTKSELECTOR);
+	csel = (SPColorGtkselector*)g_object_new (SP_TYPE_COLOR_GTKSELECTOR, NULL);
 
 	return GTK_WIDGET (csel);
 }
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 3a2c7fbed..94f450e50 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -432,7 +432,7 @@ sp_color_icc_selector_new (void)
 {
     SPColorICCSelector *csel;
 
-    csel = (SPColorICCSelector*)gtk_type_new (SP_TYPE_COLOR_ICC_SELECTOR);
+    csel = (SPColorICCSelector*)g_object_new (SP_TYPE_COLOR_ICC_SELECTOR, NULL);
 
     return GTK_WIDGET (csel);
 }
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index c252dc65e..c347a1fca 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -431,7 +431,7 @@ sp_color_notebook_new (void)
 {
     SPColorNotebook *colorbook;
 
-    colorbook = (SPColorNotebook*)gtk_type_new (SP_TYPE_COLOR_NOTEBOOK);
+    colorbook = (SPColorNotebook*)g_object_new (SP_TYPE_COLOR_NOTEBOOK, NULL);
 
     return GTK_WIDGET (colorbook);
 }
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 146ea9e1e..c07e44aa6 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -206,7 +206,7 @@ sp_color_scales_new (void)
 {
 	SPColorScales *csel;
 
-	csel = (SPColorScales*)gtk_type_new (SP_TYPE_COLOR_SCALES);
+	csel = (SPColorScales*)g_object_new (SP_TYPE_COLOR_SCALES, NULL);
 
 	return GTK_WIDGET (csel);
 }
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 152f81324..19bc73946 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -321,7 +321,7 @@ sp_color_slider_new (GtkAdjustment *adjustment)
 {
 	SPColorSlider *slider;
 
-	slider = (SPColorSlider*)gtk_type_new (SP_TYPE_COLOR_SLIDER);
+	slider = (SPColorSlider*)g_object_new (SP_TYPE_COLOR_SLIDER, NULL);
 
 	sp_color_slider_set_adjustment (slider, adjustment);
 
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 4bbda79a6..18fc76a2d 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -241,7 +241,7 @@ sp_color_wheel_selector_new (void)
 {
     SPColorWheelSelector *csel;
 
-    csel = (SPColorWheelSelector*)gtk_type_new (SP_TYPE_COLOR_WHEEL_SELECTOR);
+    csel = (SPColorWheelSelector*)g_object_new (SP_TYPE_COLOR_WHEEL_SELECTOR, NULL);
 
     return GTK_WIDGET (csel);
 }
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 141f4afc1..8f9c6a6d7 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -222,7 +222,7 @@ sp_widget_new_global (Inkscape::Application *inkscape)
 {
 	SPWidget *spw;
 
-	spw = (SPWidget*)gtk_type_new (SP_TYPE_WIDGET);
+	spw = (SPWidget*)g_object_new (SP_TYPE_WIDGET, NULL);
 
 	if (!sp_widget_construct_global (spw, inkscape)) {
 		gtk_object_unref (GTK_OBJECT (spw));
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 804bc1737..605fbeb06 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -46,7 +46,7 @@ sp_xmlview_content_new (Inkscape::XML::Node * repr)
     SPXMLViewContent *text;
 
     tb = gtk_text_buffer_new (NULL);
-    text = (SPXMLViewContent*)gtk_type_new (SP_TYPE_XMLVIEW_CONTENT);
+    text = (SPXMLViewContent*)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);