Commit e18d3c6f authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

consistently chain up using GTK_FOO_CLASS(parent_class)->bar(instance)

2008-08-12  Michael Natterer  <mitch@imendio.com>

	* gtk/*.c: consistently chain up using
	GTK_FOO_CLASS(parent_class)->bar(instance) instead of
	(*GTK_FOO_CLASS(parent_class))->bar(instance).


svn path=/trunk/; revision=21085
parent a862e0df
2008-08-12 Michael Natterer <mitch@imendio.com>
* gtk/*.c: consistently chain up using
GTK_FOO_CLASS(parent_class)->bar(instance) instead of
(*GTK_FOO_CLASS(parent_class))->bar(instance).
2008-08-12 Matthias Clasen <mclasen@redhat.com> 2008-08-12 Matthias Clasen <mclasen@redhat.com>
Bug 546730 – gtk_status_icon_get_gicon() should use a return instead Bug 546730 – gtk_status_icon_get_gicon() should use a return instead
......
...@@ -955,9 +955,9 @@ gtk_action_create_menu_item (GtkAction *action) ...@@ -955,9 +955,9 @@ gtk_action_create_menu_item (GtkAction *action)
g_return_val_if_fail (GTK_IS_ACTION (action), NULL); g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
menu_item = (* GTK_ACTION_GET_CLASS (action)->create_menu_item) (action); menu_item = GTK_ACTION_GET_CLASS (action)->create_menu_item (action);
(* GTK_ACTION_GET_CLASS (action)->connect_proxy) (action, menu_item); GTK_ACTION_GET_CLASS (action)->connect_proxy (action, menu_item);
return menu_item; return menu_item;
} }
...@@ -979,9 +979,9 @@ gtk_action_create_tool_item (GtkAction *action) ...@@ -979,9 +979,9 @@ gtk_action_create_tool_item (GtkAction *action)
g_return_val_if_fail (GTK_IS_ACTION (action), NULL); g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
button = (* GTK_ACTION_GET_CLASS (action)->create_tool_item) (action); button = GTK_ACTION_GET_CLASS (action)->create_tool_item (action);
(* GTK_ACTION_GET_CLASS (action)->connect_proxy) (action, button); GTK_ACTION_GET_CLASS (action)->connect_proxy (action, button);
return button; return button;
} }
...@@ -1013,9 +1013,9 @@ gtk_action_connect_proxy (GtkAction *action, ...@@ -1013,9 +1013,9 @@ gtk_action_connect_proxy (GtkAction *action,
prev_action = g_object_get_qdata (G_OBJECT (proxy), quark_gtk_action_proxy); prev_action = g_object_get_qdata (G_OBJECT (proxy), quark_gtk_action_proxy);
if (prev_action) if (prev_action)
(* GTK_ACTION_GET_CLASS (action)->disconnect_proxy) (prev_action, proxy); GTK_ACTION_GET_CLASS (action)->disconnect_proxy (prev_action, proxy);
(* GTK_ACTION_GET_CLASS (action)->connect_proxy) (action, proxy); GTK_ACTION_GET_CLASS (action)->connect_proxy (action, proxy);
} }
/** /**
...@@ -1037,7 +1037,7 @@ gtk_action_disconnect_proxy (GtkAction *action, ...@@ -1037,7 +1037,7 @@ gtk_action_disconnect_proxy (GtkAction *action,
g_return_if_fail (g_object_get_qdata (G_OBJECT (proxy), quark_gtk_action_proxy) == action); g_return_if_fail (g_object_get_qdata (G_OBJECT (proxy), quark_gtk_action_proxy) == action);
(* GTK_ACTION_GET_CLASS (action)->disconnect_proxy) (action, proxy); GTK_ACTION_GET_CLASS (action)->disconnect_proxy (action, proxy);
} }
/** /**
......
...@@ -743,8 +743,8 @@ gtk_action_group_get_action (GtkActionGroup *action_group, ...@@ -743,8 +743,8 @@ gtk_action_group_get_action (GtkActionGroup *action_group,
g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL); g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL);
g_return_val_if_fail (GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action != NULL, NULL); g_return_val_if_fail (GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action != NULL, NULL);
return (* GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action) return GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action (action_group,
(action_group, action_name); action_name);
} }
static gboolean static gboolean
...@@ -984,9 +984,9 @@ shared_data_unref (gpointer data) ...@@ -984,9 +984,9 @@ shared_data_unref (gpointer data)
shared_data->ref_count--; shared_data->ref_count--;
if (shared_data->ref_count == 0) if (shared_data->ref_count == 0)
{ {
if (shared_data->destroy) if (shared_data->destroy)
(*shared_data->destroy) (shared_data->data); shared_data->destroy (shared_data->data);
g_slice_free (SharedData, shared_data); g_slice_free (SharedData, shared_data);
} }
} }
......
...@@ -533,8 +533,8 @@ gtk_button_destroy (GtkObject *object) ...@@ -533,8 +533,8 @@ gtk_button_destroy (GtkObject *object)
g_free (button->label_text); g_free (button->label_text);
button->label_text = NULL; button->label_text = NULL;
} }
(* GTK_OBJECT_CLASS (gtk_button_parent_class)->destroy) (object); GTK_OBJECT_CLASS (gtk_button_parent_class)->destroy (object);
} }
static GObject* static GObject*
...@@ -545,9 +545,9 @@ gtk_button_constructor (GType type, ...@@ -545,9 +545,9 @@ gtk_button_constructor (GType type,
GObject *object; GObject *object;
GtkButton *button; GtkButton *button;
object = (* G_OBJECT_CLASS (gtk_button_parent_class)->constructor) (type, object = G_OBJECT_CLASS (gtk_button_parent_class)->constructor (type,
n_construct_properties, n_construct_properties,
construct_params); construct_params);
button = GTK_BUTTON (object); button = GTK_BUTTON (object);
button->constructed = TRUE; button->constructed = TRUE;
...@@ -1344,10 +1344,10 @@ gtk_button_expose (GtkWidget *widget, ...@@ -1344,10 +1344,10 @@ gtk_button_expose (GtkWidget *widget,
GTK_WIDGET_STATE (widget), GTK_WIDGET_STATE (widget),
button->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT, button->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
"button", "buttondefault"); "button", "buttondefault");
(* GTK_WIDGET_CLASS (gtk_button_parent_class)->expose_event) (widget, event); GTK_WIDGET_CLASS (gtk_button_parent_class)->expose_event (widget, event);
} }
return FALSE; return FALSE;
} }
......
...@@ -1235,7 +1235,7 @@ calendar_set_month_prev (GtkCalendar *calendar) ...@@ -1235,7 +1235,7 @@ calendar_set_month_prev (GtkCalendar *calendar)
static void static void
gtk_calendar_finalize (GObject *object) gtk_calendar_finalize (GObject *object)
{ {
(* G_OBJECT_CLASS (gtk_calendar_parent_class)->finalize) (object); G_OBJECT_CLASS (gtk_calendar_parent_class)->finalize (object);
} }
static void static void
...@@ -1656,9 +1656,9 @@ gtk_calendar_unrealize (GtkWidget *widget) ...@@ -1656,9 +1656,9 @@ gtk_calendar_unrealize (GtkWidget *widget)
gdk_window_destroy (priv->day_name_win); gdk_window_destroy (priv->day_name_win);
priv->day_name_win = NULL; priv->day_name_win = NULL;
} }
if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize) if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize) (widget); GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize (widget);
} }
static gchar* static gchar*
......
...@@ -229,7 +229,7 @@ gtk_check_button_size_request (GtkWidget *widget, ...@@ -229,7 +229,7 @@ gtk_check_button_size_request (GtkWidget *widget,
requisition->height = MAX (requisition->height, temp) + 2 * (focus_width + focus_pad); requisition->height = MAX (requisition->height, temp) + 2 * (focus_width + focus_pad);
} }
else else
(* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_request) (widget, requisition); GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_request (widget, requisition);
} }
static void static void
...@@ -294,7 +294,7 @@ gtk_check_button_size_allocate (GtkWidget *widget, ...@@ -294,7 +294,7 @@ gtk_check_button_size_allocate (GtkWidget *widget,
} }
} }
else else
(* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate) (widget, allocation); GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate (widget, allocation);
} }
static gint static gint
...@@ -319,7 +319,7 @@ gtk_check_button_expose (GtkWidget *widget, ...@@ -319,7 +319,7 @@ gtk_check_button_expose (GtkWidget *widget,
event); event);
} }
else if (GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event) else if (GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event)
(* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event) (widget, event); GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event (widget, event);
} }
return FALSE; return FALSE;
...@@ -335,9 +335,9 @@ gtk_check_button_draw_indicator (GtkCheckButton *check_button, ...@@ -335,9 +335,9 @@ gtk_check_button_draw_indicator (GtkCheckButton *check_button,
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button)); g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
class = GTK_CHECK_BUTTON_GET_CLASS (check_button); class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
if (class->draw_indicator) if (class->draw_indicator)
(* class->draw_indicator) (check_button, area); class->draw_indicator (check_button, area);
} }
static void static void
......
...@@ -353,7 +353,7 @@ gtk_check_menu_item_expose (GtkWidget *widget, ...@@ -353,7 +353,7 @@ gtk_check_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
if (GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event) if (GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event)
(* GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event) (widget, event); GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event (widget, event);
gtk_check_menu_item_draw_indicator (GTK_CHECK_MENU_ITEM (widget), &event->area); gtk_check_menu_item_draw_indicator (GTK_CHECK_MENU_ITEM (widget), &event->area);
...@@ -377,7 +377,7 @@ gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, ...@@ -377,7 +377,7 @@ gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area) GdkRectangle *area)
{ {
if (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator) if (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator)
(* GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator) (check_menu_item, area); GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator (check_menu_item, area);
} }
static void static void
......
...@@ -4663,7 +4663,7 @@ gtk_clist_unrealize (GtkWidget *widget) ...@@ -4663,7 +4663,7 @@ gtk_clist_unrealize (GtkWidget *widget)
clist->bg_gc = NULL; clist->bg_gc = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize) if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
} }
static void static void
...@@ -4822,7 +4822,7 @@ gtk_clist_style_set (GtkWidget *widget, ...@@ -4822,7 +4822,7 @@ gtk_clist_style_set (GtkWidget *widget,
g_return_if_fail (GTK_IS_CLIST (widget)); g_return_if_fail (GTK_IS_CLIST (widget));
if (GTK_WIDGET_CLASS (parent_class)->style_set) if (GTK_WIDGET_CLASS (parent_class)->style_set)
(*GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous_style); GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
clist = GTK_CLIST (widget); clist = GTK_CLIST (widget);
......
...@@ -1385,7 +1385,7 @@ gtk_entry_unrealize (GtkWidget *widget) ...@@ -1385,7 +1385,7 @@ gtk_entry_unrealize (GtkWidget *widget)
} }
if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize) if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize) (widget); GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize (widget);
} }
void void
......
...@@ -451,7 +451,7 @@ gtk_event_box_unrealize (GtkWidget *widget) ...@@ -451,7 +451,7 @@ gtk_event_box_unrealize (GtkWidget *widget)
} }
if (GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize) if (GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize) (widget); GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize (widget);
} }
static void static void
...@@ -463,8 +463,8 @@ gtk_event_box_map (GtkWidget *widget) ...@@ -463,8 +463,8 @@ gtk_event_box_map (GtkWidget *widget)
if (priv->event_window != NULL && !priv->above_child) if (priv->event_window != NULL && !priv->above_child)
gdk_window_show (priv->event_window); gdk_window_show (priv->event_window);
(* GTK_WIDGET_CLASS (gtk_event_box_parent_class)->map) (widget); GTK_WIDGET_CLASS (gtk_event_box_parent_class)->map (widget);
if (priv->event_window != NULL && priv->above_child) if (priv->event_window != NULL && priv->above_child)
gdk_window_show (priv->event_window); gdk_window_show (priv->event_window);
...@@ -479,8 +479,8 @@ gtk_event_box_unmap (GtkWidget *widget) ...@@ -479,8 +479,8 @@ gtk_event_box_unmap (GtkWidget *widget)
if (priv->event_window != NULL) if (priv->event_window != NULL)
gdk_window_hide (priv->event_window); gdk_window_hide (priv->event_window);
(* GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unmap) (widget); GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unmap (widget);
} }
...@@ -571,8 +571,8 @@ gtk_event_box_expose (GtkWidget *widget, ...@@ -571,8 +571,8 @@ gtk_event_box_expose (GtkWidget *widget,
{ {
if (!GTK_WIDGET_NO_WINDOW (widget)) if (!GTK_WIDGET_NO_WINDOW (widget))
gtk_event_box_paint (widget, &event->area); gtk_event_box_paint (widget, &event->area);
(* GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event) (widget, event); GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event (widget, event);
} }
return FALSE; return FALSE;
......
...@@ -637,9 +637,9 @@ gtk_file_chooser_button_constructor (GType type, ...@@ -637,9 +637,9 @@ gtk_file_chooser_button_constructor (GType type,
GSList *list; GSList *list;
char *current_folder; char *current_folder;
object = (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor) (type, object = G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor (type,
n_params, n_params,
params); params);
button = GTK_FILE_CHOOSER_BUTTON (object); button = GTK_FILE_CHOOSER_BUTTON (object);
priv = button->priv; priv = button->priv;
...@@ -1048,11 +1048,11 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget, ...@@ -1048,11 +1048,11 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
gchar *text; gchar *text;
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received != NULL) if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received != NULL)
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget, GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received (widget,
context, context,
x, y, x, y,
data, type, data, type,
drag_time); drag_time);
if (widget == NULL || context == NULL || data == NULL || data->length < 0) if (widget == NULL || context == NULL || data == NULL || data->length < 0)
return; return;
...@@ -1124,7 +1124,7 @@ gtk_file_chooser_button_show (GtkWidget *widget) ...@@ -1124,7 +1124,7 @@ gtk_file_chooser_button_show (GtkWidget *widget)
GtkFileChooserButtonPrivate *priv = button->priv; GtkFileChooserButtonPrivate *priv = button->priv;
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show) if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show)
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show) (widget); GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show (widget);
if (priv->active) if (priv->active)
open_dialog (GTK_FILE_CHOOSER_BUTTON (widget)); open_dialog (GTK_FILE_CHOOSER_BUTTON (widget));
...@@ -1139,7 +1139,7 @@ gtk_file_chooser_button_hide (GtkWidget *widget) ...@@ -1139,7 +1139,7 @@ gtk_file_chooser_button_hide (GtkWidget *widget)
gtk_widget_hide (priv->dialog); gtk_widget_hide (priv->dialog);
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide) if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide)
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide) (widget); GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide (widget);
} }
static void static void
...@@ -1160,7 +1160,7 @@ gtk_file_chooser_button_map (GtkWidget *widget) ...@@ -1160,7 +1160,7 @@ gtk_file_chooser_button_map (GtkWidget *widget)
} }
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map) if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map)
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map) (widget); GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map (widget);
} }
static gboolean static gboolean
...@@ -1370,8 +1370,8 @@ gtk_file_chooser_button_style_set (GtkWidget *widget, ...@@ -1370,8 +1370,8 @@ gtk_file_chooser_button_style_set (GtkWidget *widget,
GtkStyle *old_style) GtkStyle *old_style)
{ {
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set) if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set)
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set) (widget, GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set (widget,
old_style); old_style);
if (gtk_widget_has_screen (widget)) if (gtk_widget_has_screen (widget))
change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget)); change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
...@@ -1382,10 +1382,10 @@ gtk_file_chooser_button_screen_changed (GtkWidget *widget, ...@@ -1382,10 +1382,10 @@ gtk_file_chooser_button_screen_changed (GtkWidget *widget,
GdkScreen *old_screen) GdkScreen *old_screen)
{ {
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed) if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed)
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed) (widget, GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed (widget,
old_screen); old_screen);
change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget)); change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
} }
......
...@@ -592,7 +592,7 @@ gtk_frame_expose (GtkWidget *widget, ...@@ -592,7 +592,7 @@ gtk_frame_expose (GtkWidget *widget,
{ {
gtk_frame_paint (widget, &event->area); gtk_frame_paint (widget, &event->area);
(* GTK_WIDGET_CLASS (gtk_frame_parent_class)->expose_event) (widget, event); GTK_WIDGET_CLASS (gtk_frame_parent_class)->expose_event (widget, event);
} }
return FALSE; return FALSE;
......
...@@ -469,7 +469,7 @@ gtk_handle_box_unrealize (GtkWidget *widget) ...@@ -469,7 +469,7 @@ gtk_handle_box_unrealize (GtkWidget *widget)
hb->float_window = NULL; hb->float_window = NULL;
if (GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize) if (GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize) (widget); GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize (widget);
} }
static void static void
...@@ -954,7 +954,7 @@ gtk_handle_box_paint (GtkWidget *widget, ...@@ -954,7 +954,7 @@ gtk_handle_box_paint (GtkWidget *widget,
handle_orientation); handle_orientation);
if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
(* GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->expose_event) (widget, event); GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->expose_event (widget, event);
} }
static gint static gint
......
...@@ -1030,7 +1030,7 @@ gtk_icon_view_destroy (GtkObject *object) ...@@ -1030,7 +1030,7 @@ gtk_icon_view_destroy (GtkObject *object)
clear_dest_info (icon_view); clear_dest_info (icon_view);
clear_source_info (icon_view); clear_source_info (icon_view);
(* GTK_OBJECT_CLASS (gtk_icon_view_parent_class)->destroy) (object); GTK_OBJECT_CLASS (gtk_icon_view_parent_class)->destroy (object);
} }
/* GObject methods */ /* GObject methods */
...@@ -1039,7 +1039,7 @@ gtk_icon_view_finalize (GObject *object) ...@@ -1039,7 +1039,7 @@ gtk_icon_view_finalize (GObject *object)
{ {
gtk_icon_view_cell_layout_clear (GTK_CELL_LAYOUT (object)); gtk_icon_view_cell_layout_clear (GTK_CELL_LAYOUT (object));
(* G_OBJECT_CLASS (gtk_icon_view_parent_class)->finalize) (object); G_OBJECT_CLASS (gtk_icon_view_parent_class)->finalize (object);
} }
...@@ -1233,7 +1233,7 @@ gtk_icon_view_unrealize (GtkWidget *widget) ...@@ -1233,7 +1233,7 @@ gtk_icon_view_unrealize (GtkWidget *widget)
/* GtkWidget::unrealize destroys children and widget->window */ /* GtkWidget::unrealize destroys children and widget->window */
if (GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize) if (GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize) (widget); GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize (widget);
} }
static void static void
...@@ -1514,7 +1514,7 @@ gtk_icon_view_expose (GtkWidget *widget, ...@@ -1514,7 +1514,7 @@ gtk_icon_view_expose (GtkWidget *widget,
cairo_destroy (cr); cairo_destroy (cr);
(* GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->expose_event) (widget, expose); GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->expose_event (widget, expose);
return TRUE; return TRUE;
} }
...@@ -2131,7 +2131,7 @@ gtk_icon_view_key_press (GtkWidget *widget, ...@@ -2131,7 +2131,7 @@ gtk_icon_view_key_press (GtkWidget *widget,
return TRUE; return TRUE;
} }
return (* GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->key_press_event) (widget, event); return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->key_press_event (widget, event);
} }
static gboolean static gboolean
...@@ -2143,7 +2143,7 @@ gtk_icon_view_key_release (GtkWidget *widget, ...@@ -2143,7 +2143,7 @@ gtk_icon_view_key_release (GtkWidget *widget,
if (icon_view->priv->doing_rubberband) if (icon_view->priv->doing_rubberband)
return TRUE; return TRUE;
return (* GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->key_press_event) (widget, event); return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->key_press_event (widget, event);
} }
static void static void
...@@ -9598,7 +9598,7 @@ gtk_icon_view_get_accessible (GtkWidget *widget) ...@@ -9598,7 +9598,7 @@ gtk_icon_view_get_accessible (GtkWidget *widget)
gtk_icon_view_accessible_factory_get_type ()); gtk_icon_view_accessible_factory_get_type ());
first_time = FALSE; first_time = FALSE;
} }
return (* GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->get_accessible) (widget); return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->get_accessible (widget);
} }
static gboolean static gboolean
......
...@@ -250,8 +250,8 @@ gtk_image_menu_item_size_request (GtkWidget *widget, ...@@ -250,8 +250,8 @@ gtk_image_menu_item_size_request (GtkWidget *widget,
child_width = child_requisition.width; child_width = child_requisition.width;
child_height = child_requisition.height; child_height = child_requisition.height;
} }
(* GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_request) (widget, requisition); GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_request (widget, requisition);
/* not done with height since that happens via the /* not done with height since that happens via the
* toggle_size_request * toggle_size_request
...@@ -281,8 +281,8 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget, ...@@ -281,8 +281,8 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget,
pack_dir = GTK_PACK_DIRECTION_LTR; pack_dir = GTK_PACK_DIRECTION_LTR;
image_menu_item = GTK_IMAGE_MENU_ITEM (widget); image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
(* GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_allocate) (widget, allocation); GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_allocate (widget, allocation);
if (image_menu_item->image && show_image (image_menu_item)) if (image_menu_item->image && show_image (image_menu_item))
{ {
...@@ -357,11 +357,11 @@ gtk_image_menu_item_forall (GtkContainer *container, ...@@ -357,11 +357,11 @@ gtk_image_menu_item_forall (GtkContainer *container,
gpointer callback_data) gpointer callback_data)
{ {
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container); GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
(* GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall) (container, GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall (container,
include_internals, include_internals,
callback, callback,
callback_data); callback_data);
if (include_internals && image_menu_item->image) if (include_internals && image_menu_item->image)
(* callback) (image_menu_item->image, callback_data); (* callback) (image_menu_item->image, callback_data);
...@@ -566,7 +566,7 @@ gtk_image_menu_item_remove (GtkContainer *container, ...@@ -566,7 +566,7 @@ gtk_image_menu_item_remove (GtkContainer *container,
} }
else else
{ {
(* GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->remove) (container, child); GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->remove (container, child);
} }
} }
......
...@@ -2562,7 +2562,7 @@ gtk_label_size_allocate (GtkWidget *widget, ...@@ -2562,7 +2562,7 @@ gtk_label_size_allocate (GtkWidget *widget,
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
(* GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate) (widget, allocation); GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate (widget, allocation);
if (label->ellipsize) if (label->ellipsize)
{ {
...@@ -3061,8 +3061,8 @@ gtk_label_realize (GtkWidget *widget) ...@@ -3061,8 +3061,8 @@ gtk_label_realize (GtkWidget *widget)
GtkLabel *label; GtkLabel *label;
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
(* GTK_WIDGET_CLASS (gtk_label_parent_class)->realize) (widget); GTK_WIDGET_CLASS (gtk_label_parent_class)->realize (widget);
if (label->select_info) if (label->select_info)