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>
Bug 546730 – gtk_status_icon_get_gicon() should use a return instead
......
......@@ -955,9 +955,9 @@ gtk_action_create_menu_item (GtkAction *action)
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;
}
......@@ -979,9 +979,9 @@ gtk_action_create_tool_item (GtkAction *action)
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;
}
......@@ -1013,9 +1013,9 @@ gtk_action_connect_proxy (GtkAction *action,
prev_action = g_object_get_qdata (G_OBJECT (proxy), quark_gtk_action_proxy);
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,
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,
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);
return (* GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action)
(action_group, action_name);
return GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action (action_group,
action_name);
}
static gboolean
......@@ -985,7 +985,7 @@ shared_data_unref (gpointer data)
if (shared_data->ref_count == 0)
{
if (shared_data->destroy)
(*shared_data->destroy) (shared_data->data);
shared_data->destroy (shared_data->data);
g_slice_free (SharedData, shared_data);
}
......
......@@ -534,7 +534,7 @@ gtk_button_destroy (GtkObject *object)
button->label_text = NULL;
}
(* GTK_OBJECT_CLASS (gtk_button_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_button_parent_class)->destroy (object);
}
static GObject*
......@@ -545,7 +545,7 @@ gtk_button_constructor (GType type,
GObject *object;
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,
construct_params);
......@@ -1345,7 +1345,7 @@ gtk_button_expose (GtkWidget *widget,
button->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
"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;
......
......@@ -1235,7 +1235,7 @@ calendar_set_month_prev (GtkCalendar *calendar)
static void
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
......@@ -1658,7 +1658,7 @@ gtk_calendar_unrealize (GtkWidget *widget)
}
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*
......
......@@ -229,7 +229,7 @@ gtk_check_button_size_request (GtkWidget *widget,
requisition->height = MAX (requisition->height, temp) + 2 * (focus_width + focus_pad);
}
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
......@@ -294,7 +294,7 @@ gtk_check_button_size_allocate (GtkWidget *widget,
}
}
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
......@@ -319,7 +319,7 @@ gtk_check_button_expose (GtkWidget *widget,
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;
......@@ -337,7 +337,7 @@ gtk_check_button_draw_indicator (GtkCheckButton *check_button,
class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
if (class->draw_indicator)
(* class->draw_indicator) (check_button, area);
class->draw_indicator (check_button, area);
}
static void
......
......@@ -353,7 +353,7 @@ gtk_check_menu_item_expose (GtkWidget *widget,
GdkEventExpose *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);
......@@ -377,7 +377,7 @@ gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area)
{
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
......
......@@ -4663,7 +4663,7 @@ gtk_clist_unrealize (GtkWidget *widget)
clist->bg_gc = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
}
static void
......@@ -4822,7 +4822,7 @@ gtk_clist_style_set (GtkWidget *widget,
g_return_if_fail (GTK_IS_CLIST (widget));
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);
......
......@@ -1385,7 +1385,7 @@ gtk_entry_unrealize (GtkWidget *widget)
}
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
......
......@@ -451,7 +451,7 @@ gtk_event_box_unrealize (GtkWidget *widget)
}
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
......@@ -464,7 +464,7 @@ gtk_event_box_map (GtkWidget *widget)
if (priv->event_window != NULL && !priv->above_child)
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)
gdk_window_show (priv->event_window);
......@@ -480,7 +480,7 @@ gtk_event_box_unmap (GtkWidget *widget)
if (priv->event_window != NULL)
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);
}
......@@ -572,7 +572,7 @@ gtk_event_box_expose (GtkWidget *widget,
if (!GTK_WIDGET_NO_WINDOW (widget))
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;
......
......@@ -637,7 +637,7 @@ gtk_file_chooser_button_constructor (GType type,
GSList *list;
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,
params);
button = GTK_FILE_CHOOSER_BUTTON (object);
......@@ -1048,7 +1048,7 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
gchar *text;
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,
x, y,
data, type,
......@@ -1124,7 +1124,7 @@ gtk_file_chooser_button_show (GtkWidget *widget)
GtkFileChooserButtonPrivate *priv = button->priv;
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)
open_dialog (GTK_FILE_CHOOSER_BUTTON (widget));
......@@ -1139,7 +1139,7 @@ gtk_file_chooser_button_hide (GtkWidget *widget)
gtk_widget_hide (priv->dialog);
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
......@@ -1160,7 +1160,7 @@ gtk_file_chooser_button_map (GtkWidget *widget)
}
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
......@@ -1370,7 +1370,7 @@ gtk_file_chooser_button_style_set (GtkWidget *widget,
GtkStyle *old_style)
{
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);
if (gtk_widget_has_screen (widget))
......@@ -1382,7 +1382,7 @@ gtk_file_chooser_button_screen_changed (GtkWidget *widget,
GdkScreen *old_screen)
{
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);
change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
......
......@@ -592,7 +592,7 @@ gtk_frame_expose (GtkWidget *widget,
{
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;
......
......@@ -469,7 +469,7 @@ gtk_handle_box_unrealize (GtkWidget *widget)
hb->float_window = NULL;
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
......@@ -954,7 +954,7 @@ gtk_handle_box_paint (GtkWidget *widget,
handle_orientation);
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
......
......@@ -1030,7 +1030,7 @@ gtk_icon_view_destroy (GtkObject *object)
clear_dest_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 */
......@@ -1039,7 +1039,7 @@ gtk_icon_view_finalize (GObject *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)
/* GtkWidget::unrealize destroys children and widget->window */
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
......@@ -1514,7 +1514,7 @@ gtk_icon_view_expose (GtkWidget *widget,
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;
}
......@@ -2131,7 +2131,7 @@ gtk_icon_view_key_press (GtkWidget *widget,
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
......@@ -2143,7 +2143,7 @@ gtk_icon_view_key_release (GtkWidget *widget,
if (icon_view->priv->doing_rubberband)
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
......@@ -9598,7 +9598,7 @@ gtk_icon_view_get_accessible (GtkWidget *widget)
gtk_icon_view_accessible_factory_get_type ());
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
......
......@@ -251,7 +251,7 @@ gtk_image_menu_item_size_request (GtkWidget *widget,
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
* toggle_size_request
......@@ -282,7 +282,7 @@ gtk_image_menu_item_size_allocate (GtkWidget *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))
{
......@@ -358,7 +358,7 @@ gtk_image_menu_item_forall (GtkContainer *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,
callback,
callback_data);
......@@ -566,7 +566,7 @@ gtk_image_menu_item_remove (GtkContainer *container,
}
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,
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)
{
......@@ -3062,7 +3062,7 @@ gtk_label_realize (GtkWidget *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)
gtk_label_create_window (label);
......@@ -3078,7 +3078,7 @@ gtk_label_unrealize (GtkWidget *widget)
if (label->select_info)
gtk_label_destroy_window (label);
(* GTK_WIDGET_CLASS (gtk_label_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_label_parent_class)->unrealize (widget);
}
static void
......@@ -3088,7 +3088,7 @@ gtk_label_map (GtkWidget *widget)
label = GTK_LABEL (widget);
(* GTK_WIDGET_CLASS (gtk_label_parent_class)->map) (widget);
GTK_WIDGET_CLASS (gtk_label_parent_class)->map (widget);
if (label->select_info)
gdk_window_show (label->select_info->window);
......@@ -3104,7 +3104,7 @@ gtk_label_unmap (GtkWidget *widget)
if (label->select_info)
gdk_window_hide (label->select_info->window);
(* GTK_WIDGET_CLASS (gtk_label_parent_class)->unmap) (widget);
GTK_WIDGET_CLASS (gtk_label_parent_class)->unmap (widget);
}
static void
......
......@@ -884,7 +884,7 @@ static void
gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
{
if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set)
(* GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set) (widget, old_style);
GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
if (GTK_WIDGET_REALIZED (widget))
{
......@@ -927,7 +927,7 @@ gtk_layout_unrealize (GtkWidget *widget)
layout->bin_window = NULL;
if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
}
static void
......@@ -1005,7 +1005,7 @@ gtk_layout_expose (GtkWidget *widget,
if (event->window != layout->bin_window)
return FALSE;
(* GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event) (widget, event);
GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event (widget, event);
return FALSE;
}
......
......@@ -459,7 +459,7 @@ gtk_link_button_button_press (GtkWidget *widget,
}
if (GTK_WIDGET_CLASS (gtk_link_button_parent_class)->button_press_event)
return (* GTK_WIDGET_CLASS (gtk_link_button_parent_class)->button_press_event) (widget, event);
return GTK_WIDGET_CLASS (gtk_link_button_parent_class)->button_press_event (widget, event);
return FALSE;
}
......
......@@ -428,7 +428,7 @@ gtk_list_item_realize (GtkWidget *widget)
gint attributes_mask;
/*if (GTK_WIDGET_CLASS (parent_class)->realize)
(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);*/
GTK_WIDGET_CLASS (parent_class)->realize (widget);*/
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
......@@ -566,7 +566,7 @@ gtk_list_item_expose (GtkWidget *widget,
0, 0, -1, -1);
}
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
if (GTK_WIDGET_HAS_FOCUS (widget))
{
......
......@@ -2317,7 +2317,7 @@ gtk_menu_unrealize (GtkWidget *widget)
gdk_window_destroy (menu->bin_window);
menu->bin_window = NULL;
(* GTK_WIDGET_CLASS (gtk_menu_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_menu_parent_class)->unrealize (widget);
}
static void
......@@ -2723,7 +2723,7 @@ gtk_menu_expose (GtkWidget *widget,
{
gtk_menu_paint (widget, event);
(* GTK_WIDGET_CLASS (gtk_menu_parent_class)->expose_event) (widget, event);
GTK_WIDGET_CLASS (gtk_menu_parent_class)->expose_event (widget, event);
}
return FALSE;
......
......@@ -537,7 +537,7 @@ gtk_menu_bar_expose (GtkWidget *widget,
{
gtk_menu_bar_paint (widget, &event->area);
(* GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->expose_event) (widget, event);
GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->expose_event (widget, event);
}
return FALSE;
......
......@@ -854,7 +854,7 @@ gtk_menu_item_unrealize (GtkWidget *widget)
menu_item->event_window = NULL;
if (GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize (widget);
}
static void
......@@ -1013,7 +1013,7 @@ gtk_menu_item_expose (GtkWidget *widget,
{
gtk_menu_item_paint (widget, &event->area);
(* GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->expose_event) (widget, event);
GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->expose_event (widget, event);
}
return FALSE;
......
......@@ -1785,7 +1785,7 @@ gtk_notebook_unrealize (GtkWidget *widget)
}
if (GTK_WIDGET_CLASS (gtk_notebook_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_notebook_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_notebook_parent_class)->unrealize (widget);
}
static void
......@@ -3168,7 +3168,7 @@ gtk_notebook_style_set (GtkWidget *widget,
notebook->has_after_previous = has_after_previous;
notebook->has_after_next = has_after_next;
(* GTK_WIDGET_CLASS (gtk_notebook_parent_class)->style_set) (widget, previous);
GTK_WIDGET_CLASS (gtk_notebook_parent_class)->style_set (widget, previous);
}
static gboolean
......
......@@ -774,7 +774,7 @@ gtk_paned_unrealize (GtkWidget *widget)
gtk_paned_set_first_paned (paned, NULL);
if (GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize (widget);
}
static void
......@@ -931,7 +931,7 @@ gtk_paned_focus (GtkWidget *widget,
*/
GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
retval = (* GTK_WIDGET_CLASS (gtk_paned_parent_class)->focus) (widget, direction);
retval = GTK_WIDGET_CLASS (gtk_paned_parent_class)->focus (widget, direction);
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
return retval;
......@@ -1452,7 +1452,7 @@ gtk_paned_set_focus_child (GtkContainer *container,
}
if (GTK_CONTAINER_CLASS (gtk_paned_parent_class)->set_focus_child)
(* GTK_CONTAINER_CLASS (gtk_paned_parent_class)->set_focus_child) (container, focus_child);
GTK_CONTAINER_CLASS (gtk_paned_parent_class)->set_focus_child (container, focus_child);
}
static void
......
......@@ -436,7 +436,7 @@ gtk_path_bar_unrealize (GtkWidget *widget)
gdk_window_destroy (path_bar->event_window);
path_bar->event_window = NULL;
(* GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unrealize (widget);
}
/* This is a tad complicated
......
......@@ -568,7 +568,7 @@ gtk_plug_unrealize (GtkWidget *widget)
}
if (GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize (widget);
}
static void
......
......@@ -1193,7 +1193,7 @@ gtk_range_destroy (GtkObject *object)
range->adjustment = NULL;
}
(* GTK_OBJECT_CLASS (gtk_range_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_range_parent_class)->destroy (object);
}
static void
......@@ -1295,7 +1295,7 @@ gtk_range_unrealize (GtkWidget *widget)
range->event_window = NULL;
if (GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize (widget);
}
static void
......@@ -2331,7 +2331,7 @@ gtk_range_style_set (GtkWidget *widget,
range->need_recalc = TRUE;
(* GTK_WIDGET_CLASS (gtk_range_parent_class)->style_set) (widget, previous_style);
GTK_WIDGET_CLASS (gtk_range_parent_class)->style_set (widget, previous_style);
}
static void
......@@ -2783,7 +2783,7 @@ gtk_range_calc_request (GtkRange *range,
border->bottom = 0;
if (GTK_RANGE_GET_CLASS (range)->get_range_border)
(* GTK_RANGE_GET_CLASS (range)->get_range_border) (range, border);
GTK_RANGE_GET_CLASS (range)->get_range_border (range, border);
n_steppers_ab = 0;
n_steppers_cd = 0;
......
......@@ -408,7 +408,7 @@ gtk_ruler_unrealize (GtkWidget *widget)
}
if (GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize) (widget);
GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize (widget);
}
static void
......
......@@ -580,7 +580,7 @@ gtk_scale_style_set (GtkWidget *widget,
_gtk_scale_clear_layout (GTK_SCALE (widget));
(* GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_set) (widget, previous);
GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_set (widget, previous);
}
static void
......
......@@ -128,7 +128,7 @@ gtk_scrollbar_style_set (GtkWidget *widget,
range->has_stepper_c = has_c;
range->has_stepper_d = has_d;
(* GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_set) (widget, previous);
GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_set (widget, previous);
}
#define __GTK_SCROLLBAR_C__
......
......@@ -998,7 +998,7 @@ gtk_scrolled_window_expose (GtkWidget *widget,
{
gtk_scrolled_window_paint (widget, &event->area);
(* GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->expose_event) (widget, event);
GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->expose_event (widget, event);
}
return FALSE;
......