summaryrefslogtreecommitdiff
path: root/gtk/gtkwidget.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2002-01-09 10:28:02 +0000
committerTim Janik <timj@src.gnome.org>2002-01-09 10:28:02 +0000
commitadb892f2c92f2cd984099d567907734710ac5d60 (patch)
tree535d1e22db71e8111bcf1dfda603bd65e906f4ab /gtk/gtkwidget.c
parent8ccfa3edb95ed3fb5d0ba4f3c0a46e8c729a768e (diff)
downloadgtk+-adb892f2c92f2cd984099d567907734710ac5d60.tar.gz
don't cast a possible NULL pointer.
Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org> * gtk/gtklayout.c (gtk_layout_get_property): * gtk/gtkspinbutton.c (gtk_spin_button_get_property): * gtk/gtktreeview.c (gtk_tree_view_get_property): * gtk/gtkwidget.c (gtk_widget_get_property): * gtk/gtkfontsel.c (gtk_font_selection_get_property): * gtk/gtkrange.c (gtk_range_get_property): * gtk/gtkviewport.c (gtk_viewport_get_property): * gtk/gtkprogressbar.c (gtk_progress_bar_get_property): don't cast a possible NULL pointer.
Diffstat (limited to 'gtk/gtkwidget.c')
-rw-r--r--gtk/gtkwidget.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2813e16fdc..ee520ba814 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1185,7 +1185,7 @@ gtk_widget_get_property (GObject *object,
break;
case PROP_PARENT:
if (widget->parent)
- g_value_set_object (value, G_OBJECT (widget->parent));
+ g_value_set_object (value, widget->parent);
else
g_value_set_object (value, NULL);
break;
@@ -1231,7 +1231,7 @@ gtk_widget_get_property (GObject *object,
g_value_set_boolean (value, (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE));
break;
case PROP_STYLE:
- g_value_set_object (value, G_OBJECT (gtk_widget_get_style (widget)));
+ g_value_set_object (value, gtk_widget_get_style (widget));
break;
case PROP_EVENTS:
eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);