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

42 files changed, 186 insertions, 189 deletions

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 3fb1d0bb78..e3f377ec21 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -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);
 }
 
 /**
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index c8deeaf07a..a4c5feb624 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -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
@@ -984,9 +984,9 @@ shared_data_unref (gpointer data)
   shared_data->ref_count--;
   if (shared_data->ref_count == 0)
     {
-      if (shared_data->destroy) 
-	(*shared_data->destroy) (shared_data->data);
-      
+      if (shared_data->destroy)
+	shared_data->destroy (shared_data->data);
+
       g_slice_free (SharedData, shared_data);
     }
 }
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 58a6926125..e68c5297ff 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -533,8 +533,8 @@ gtk_button_destroy (GtkObject *object)
       g_free (button->label_text);
       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,9 +545,9 @@ gtk_button_constructor (GType                  type,
   GObject *object;
   GtkButton *button;
 
-  object = (* G_OBJECT_CLASS (gtk_button_parent_class)->constructor) (type,
-								      n_construct_properties,
-								      construct_params);
+  object = G_OBJECT_CLASS (gtk_button_parent_class)->constructor (type,
+                                                                  n_construct_properties,
+                                                                  construct_params);
 
   button = GTK_BUTTON (object);
   button->constructed = TRUE;
@@ -1344,10 +1344,10 @@ gtk_button_expose (GtkWidget      *widget,
 			 GTK_WIDGET_STATE (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;
 }
 
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 61d9d29f90..ff5003c6fb 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -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
@@ -1656,9 +1656,9 @@ gtk_calendar_unrealize (GtkWidget *widget)
       gdk_window_destroy (priv->day_name_win);
       priv->day_name_win = NULL;      
     }
-  
+
   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*
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index ece626b7f4..92d82f279b 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -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;
@@ -335,9 +335,9 @@ gtk_check_button_draw_indicator (GtkCheckButton *check_button,
   g_return_if_fail (GTK_IS_CHECK_BUTTON (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
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 38ad2fada9..b7f35cb361 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -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
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 937776ec23..274b535964 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -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);
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 4f00012119..c650154604 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -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
diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index f5ba09bd91..b96b725ec7 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -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
@@ -463,8 +463,8 @@ 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);
@@ -479,8 +479,8 @@ 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);
 }
 
 
@@ -571,8 +571,8 @@ 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;
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 910972b5c9..0b2dd15188 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -637,9 +637,9 @@ gtk_file_chooser_button_constructor (GType                  type,
   GSList *list;
   char *current_folder;
 
-  object = (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor) (type,
-										  n_params,
-										  params);
+  object = G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor (type,
+									       n_params,
+									       params);
   button = GTK_FILE_CHOOSER_BUTTON (object);
   priv = button->priv;
 
@@ -1048,11 +1048,11 @@ 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,
-										    context,
-										    x, y,
-										    data, type,
-										    drag_time);
+    GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received (widget,
+										 context,
+										 x, y,
+										 data, type,
+										 drag_time);
 
   if (widget == NULL || context == NULL || data == NULL || data->length < 0)
     return;
@@ -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,8 +1370,8 @@ 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,
-									   old_style);
+    GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set (widget,
+									old_style);
 
   if (gtk_widget_has_screen (widget))
     change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
@@ -1382,10 +1382,10 @@ 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,
-										old_screen);
+    GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed (widget,
+									     old_screen);
 
-  change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget)); 
+  change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
 }
 
 
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 2c2dc2d569..c76745572b 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -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;
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 33a346f931..8f94d18c6b 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -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
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index dcab923dc6..8ad26d7b40 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -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
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index d0f296284f..6d97a28609 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -250,8 +250,8 @@ gtk_image_menu_item_size_request (GtkWidget      *widget,
       child_width = child_requisition.width;
       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
@@ -281,8 +281,8 @@ gtk_image_menu_item_size_allocate (GtkWidget     *widget,
     pack_dir = GTK_PACK_DIRECTION_LTR;
   
   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))
     {
@@ -357,11 +357,11 @@ gtk_image_menu_item_forall (GtkContainer   *container,
                             gpointer        callback_data)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
-  
-  (* GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall) (container,
-								      include_internals,
-								      callback,
-								      callback_data);
+
+  GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall (container,
+                                                                  include_internals,
+                                                                  callback,
+                                                                  callback_data);
 
   if (include_internals && image_menu_item->image)
     (* callback) (image_menu_item->image, 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);
     }
 }
 
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index ce4de11b7d..75d90cb97a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -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)
     {
@@ -3061,8 +3061,8 @@ gtk_label_realize (GtkWidget *widget)
   GtkLabel *label;
 
   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);
@@ -3077,8 +3077,8 @@ 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
@@ -3087,9 +3087,9 @@ gtk_label_map (GtkWidget *widget)
   GtkLabel *label;
 
   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);
 }
@@ -3103,8 +3103,8 @@ 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
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index cdd2131cfa..fac55ba0bc 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -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     
@@ -1004,8 +1004,8 @@ 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;
 }
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 10c4620801..843a6888fd 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -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;
 }
diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 066179cee2..a0df6005c0 100644
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -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,8 +566,8 @@ 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))
         {
           if (GTK_IS_LIST (widget->parent) && GTK_LIST (widget->parent)->add_mode)
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 70451bd9c0..48c047ec8b 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -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
@@ -2722,8 +2722,8 @@ gtk_menu_expose (GtkWidget	*widget,
   if (GTK_WIDGET_DRAWABLE (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;
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 3b9677bb42..339c7a9d29 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -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;
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 20612d7b77..b8ab1e8d74 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -852,9 +852,9 @@ gtk_menu_item_unrealize (GtkWidget *widget)
   gdk_window_set_user_data (menu_item->event_window, NULL);
   gdk_window_destroy (menu_item->event_window);
   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;
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 51e4536bcd..1eddcd015f 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -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
@@ -3167,8 +3167,8 @@ gtk_notebook_style_set  (GtkWidget *widget,
   notebook->has_before_next = has_before_next;
   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
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 400111ab29..8778673364 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -772,9 +772,9 @@ gtk_paned_unrealize (GtkWidget *widget)
   gtk_paned_set_last_child2_focus (paned, NULL);
   gtk_paned_set_saved_focus (paned, NULL);
   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
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 01cb8a473d..be6996d34f 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -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
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index a0373f982b..12a31adca4 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -566,9 +566,9 @@ gtk_plug_unrealize (GtkWidget *widget)
       gtk_window_group_remove_window (plug->modality_group, GTK_WINDOW (plug));
       g_object_unref (plug->modality_group);
     }
-  
+
   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
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 6bf507424e..78c28d66ab 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -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
@@ -1293,9 +1293,9 @@ gtk_range_unrealize (GtkWidget *widget)
   gdk_window_set_user_data (range->event_window, NULL);
   gdk_window_destroy (range->event_window);
   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;
diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 49bf8e5ea7..89f6d05f57 100644
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -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
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 1d87b92d2b..9535823c90 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -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
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 26dba30309..56ebe6cb22 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -127,8 +127,8 @@ gtk_scrollbar_style_set  (GtkWidget *widget,
   range->has_stepper_b = has_b;
   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__
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index e9dc57c1be..78f1110295 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.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;
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 5e108e57f7..7fabd59a32 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -408,10 +408,10 @@ gtk_socket_unrealize (GtkWidget *widget)
     }
 
   if (GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize) (widget);
+    GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize (widget);
 }
-  
-static void 
+
+static void
 gtk_socket_size_request (GtkWidget      *widget,
 			 GtkRequisition *requisition)
 {
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 72d09666e9..a6ef87b8d5 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -976,7 +976,7 @@ gtk_spin_button_style_set (GtkWidget *widget,
   if (previous_style && GTK_WIDGET_REALIZED (widget))
     gtk_style_set_background (widget->style, spin->panel, GTK_STATE_NORMAL);
 
-  (* GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->style_set) (widget, previous_style);
+  GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->style_set (widget, previous_style);
 }
 
 
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index fb34e5c30a..a2fa89e114 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -675,8 +675,8 @@ gtk_statusbar_realize (GtkWidget *widget)
   GtkStatusbar *statusbar;
 
   statusbar = GTK_STATUSBAR (widget);
-  
-  (* GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize (widget);
 
   if (statusbar->has_resize_grip)
     gtk_statusbar_create_window (statusbar);
@@ -691,8 +691,8 @@ gtk_statusbar_unrealize (GtkWidget *widget)
 
   if (statusbar->grip_window)
     gtk_statusbar_destroy_window (statusbar);
-  
-  (* GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unrealize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unrealize (widget);
 }
 
 static void
@@ -701,9 +701,9 @@ gtk_statusbar_map (GtkWidget *widget)
   GtkStatusbar *statusbar;
 
   statusbar = GTK_STATUSBAR (widget);
-  
-  (* GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->map) (widget);
-  
+
+  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->map (widget);
+
   if (statusbar->grip_window)
     gdk_window_show (statusbar->grip_window);
 }
@@ -717,8 +717,8 @@ gtk_statusbar_unmap (GtkWidget *widget)
 
   if (statusbar->grip_window)
     gdk_window_hide (statusbar->grip_window);
-  
-  (* GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unmap) (widget);
+
+  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unmap (widget);
 }
 
 static gboolean
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 9bd2b5941e..5bc1aa1ce5 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1375,7 +1375,7 @@ gtk_text_unrealize (GtkWidget *widget)
   free_cache (text);
 
   if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+    GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
 }
 
 static void
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 7172d29afe..010dd0220b 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -286,7 +286,7 @@ gtk_text_layout_finalize (GObject *object)
     }
 
 
-  (* G_OBJECT_CLASS (gtk_text_layout_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_text_layout_parent_class)->finalize (object);
 }
 
 void
@@ -665,8 +665,7 @@ gtk_text_layout_free_line_data (GtkTextLayout     *layout,
                                 GtkTextLine       *line,
                                 GtkTextLineData   *line_data)
 {
-  (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->free_line_data)
-    (layout, line, line_data);
+  GTK_TEXT_LAYOUT_GET_CLASS (layout)->free_line_data (layout, line, line_data);
 }
 
 void
@@ -674,8 +673,7 @@ gtk_text_layout_invalidate (GtkTextLayout *layout,
                             const GtkTextIter *start_index,
                             const GtkTextIter *end_index)
 {
-  (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate)
-    (layout, start_index, end_index);
+  GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate (layout, start_index, end_index);
 }
 
 void
@@ -683,8 +681,7 @@ gtk_text_layout_invalidate_cursors (GtkTextLayout *layout,
 				    const GtkTextIter *start_index,
 				    const GtkTextIter *end_index)
 {
-  (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate_cursors)
-    (layout, start_index, end_index);
+  GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate_cursors (layout, start_index, end_index);
 }
 
 GtkTextLineData*
@@ -693,7 +690,7 @@ gtk_text_layout_wrap (GtkTextLayout *layout,
                       /* may be NULL */
                       GtkTextLineData *line_data)
 {
-  return (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->wrap) (layout, line, line_data);
+  return GTK_TEXT_LAYOUT_GET_CLASS (layout)->wrap (layout, line, line_data);
 }
 
 GSList*
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6fe41be120..c59ec95a43 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2770,7 +2770,7 @@ gtk_text_view_destroy (GtkObject *object)
       priv->im_spot_idle = 0;
     }
 
-  (* GTK_OBJECT_CLASS (gtk_text_view_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_text_view_parent_class)->destroy (object);
 }
 
 static void
@@ -2810,8 +2810,8 @@ gtk_text_view_finalize (GObject *object)
     text_window_free (text_view->bottom_window);
 
   g_object_unref (text_view->im_context);
-  
-  (* G_OBJECT_CLASS (gtk_text_view_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (gtk_text_view_parent_class)->finalize (object);
 }
 
 static void
@@ -3767,11 +3767,11 @@ gtk_text_view_unrealize (GtkWidget *widget)
     text_window_unrealize (text_view->bottom_window);
 
   gtk_text_view_destroy_layout (text_view);
-  
-  (* GTK_WIDGET_CLASS (gtk_text_view_parent_class)->unrealize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_text_view_parent_class)->unrealize (widget);
 }
 
-static void 
+static void
 gtk_text_view_set_background (GtkTextView *text_view)
 {
   GtkWidget *widget = GTK_WIDGET (text_view);
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 9e911d8e19..33f045a0c4 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -280,14 +280,14 @@ connect_proxy (GtkAction *action,
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (proxy),
 				  toggle_action->private_data->active);
 
-  (* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+  GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
 }
 
 static void
 disconnect_proxy (GtkAction *action, 
 		  GtkWidget *proxy)
 {
-  (* GTK_ACTION_CLASS (parent_class)->disconnect_proxy) (action, proxy);
+  GTK_ACTION_CLASS (parent_class)->disconnect_proxy (action, proxy);
 }
 
 /**
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 4389b34cb8..fbcd8fca0d 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -443,8 +443,8 @@ static void
 gtk_tree_item_realize (GtkWidget *widget)
 {
   if (GTK_WIDGET_CLASS (parent_class)->realize)
-    (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-  
+    GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
   gdk_window_set_background (widget->window, 
 			     &widget->style->base[GTK_STATE_NORMAL]);
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3f3ddcd02f..ec119b504e 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1532,7 +1532,7 @@ gtk_tree_view_get_property (GObject    *object,
 static void
 gtk_tree_view_finalize (GObject *object)
 {
-  (* G_OBJECT_CLASS (gtk_tree_view_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_tree_view_parent_class)->finalize (object);
 }
 
 
@@ -1631,14 +1631,14 @@ gtk_tree_view_destroy (GtkObject *object)
   if (tree_view->priv->column_drop_func_data &&
       tree_view->priv->column_drop_func_data_destroy)
     {
-      (* tree_view->priv->column_drop_func_data_destroy) (tree_view->priv->column_drop_func_data);
+      tree_view->priv->column_drop_func_data_destroy (tree_view->priv->column_drop_func_data);
       tree_view->priv->column_drop_func_data = NULL;
     }
 
   if (tree_view->priv->destroy_count_destroy &&
       tree_view->priv->destroy_count_data)
     {
-      (* tree_view->priv->destroy_count_destroy) (tree_view->priv->destroy_count_data);
+      tree_view->priv->destroy_count_destroy (tree_view->priv->destroy_count_data);
       tree_view->priv->destroy_count_data = NULL;
     }
 
@@ -1663,19 +1663,19 @@ gtk_tree_view_destroy (GtkObject *object)
 
   if (tree_view->priv->search_destroy && tree_view->priv->search_user_data)
     {
-      (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
+      tree_view->priv->search_destroy (tree_view->priv->search_user_data);
       tree_view->priv->search_user_data = NULL;
     }
 
   if (tree_view->priv->search_position_destroy && tree_view->priv->search_position_user_data)
     {
-      (* tree_view->priv->search_position_destroy) (tree_view->priv->search_position_user_data);
+      tree_view->priv->search_position_destroy (tree_view->priv->search_position_user_data);
       tree_view->priv->search_position_user_data = NULL;
     }
 
   if (tree_view->priv->row_separator_destroy && tree_view->priv->row_separator_data)
     {
-      (* tree_view->priv->row_separator_destroy) (tree_view->priv->row_separator_data);
+      tree_view->priv->row_separator_destroy (tree_view->priv->row_separator_data);
       tree_view->priv->row_separator_data = NULL;
     }
   
@@ -1940,7 +1940,7 @@ gtk_tree_view_unrealize (GtkWidget *widget)
 
   /* GtkWidget::unrealize destroys children and widget->window */
   if (GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize) (widget);
+    GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize (widget);
 }
 
 /* GtkWidget::size_request helper */
@@ -2484,9 +2484,9 @@ row_is_separator (GtkTreeView *tree_view,
       else
 	gtk_tree_model_get_iter (tree_view->priv->model, &tmpiter, path);
 
-      is_separator = (* tree_view->priv->row_separator_func) (tree_view->priv->model,
-							      &tmpiter,
-							      tree_view->priv->row_separator_data);
+      is_separator = tree_view->priv->row_separator_func (tree_view->priv->model,
+                                                          &tmpiter,
+                                                          tree_view->priv->row_separator_data);
     }
 
   return is_separator;
@@ -5026,7 +5026,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	    if (!tree_view->priv->column_drop_func)
 	      return left_column;
 
-	    if (!(*tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
+	    if (!tree_view->priv->column_drop_func (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
 	      {
 		left_column = cur_column;
 		continue;
@@ -5038,7 +5038,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	if (!tree_view->priv->column_drop_func)
 	  return left_column;
 
-	if ((*tree_view->priv->column_drop_func) (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data))
+	if (tree_view->priv->column_drop_func (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data))
 	  return left_column;
 	else
 	  return (GtkTreeViewColumn *)0x1;
@@ -5077,7 +5077,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	    if (!tree_view->priv->column_drop_func)
 	      return left_column;
 
-	    if (!(*tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
+	    if (!tree_view->priv->column_drop_func (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
 	      {
 		left_column = cur_column;
 		continue;
@@ -5089,7 +5089,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	if (!tree_view->priv->column_drop_func)
 	  return left_column;
 
-	if ((*tree_view->priv->column_drop_func) (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data))
+	if (tree_view->priv->column_drop_func (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data))
 	  return left_column;
 	else
 	  return (GtkTreeViewColumn *)0x1;
@@ -5135,7 +5135,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	    if (!tree_view->priv->column_drop_func)
 	      return left_column;
 
-	    if ((*tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
+	    if (tree_view->priv->column_drop_func (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
 	      return left_column;
 
 	    cur_column = left_column;
@@ -5145,7 +5145,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	if (!tree_view->priv->column_drop_func)
 	  return NULL;
 
-	if ((*tree_view->priv->column_drop_func) (tree_view, column, NULL, cur_column, tree_view->priv->column_drop_func_data))
+	if (tree_view->priv->column_drop_func (tree_view, column, NULL, cur_column, tree_view->priv->column_drop_func_data))
 	  return NULL;
 	else
 	  return (GtkTreeViewColumn *)0x1;
@@ -5174,7 +5174,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	    if (!tree_view->priv->column_drop_func)
 	      return left_column;
 
-	    if ((*tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
+	    if (tree_view->priv->column_drop_func (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
 	      return left_column;
 
 	    cur_column = left_column;
@@ -5184,7 +5184,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
 	if (!tree_view->priv->column_drop_func)
 	  return NULL;
 
-	if ((*tree_view->priv->column_drop_func) (tree_view, column, NULL, cur_column, tree_view->priv->column_drop_func_data))
+	if (tree_view->priv->column_drop_func (tree_view, column, NULL, cur_column, tree_view->priv->column_drop_func_data))
 	  return NULL;
 	else
 	  return (GtkTreeViewColumn *)0x1;
@@ -5435,7 +5435,7 @@ gtk_tree_view_key_release (GtkWidget   *widget,
   if (tree_view->priv->rubber_band_status)
     return TRUE;
 
-  return (* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->key_release_event) (widget, event);
+  return GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->key_release_event (widget, event);
 }
 
 /* FIXME Is this function necessary? Can I get an enter_notify event
@@ -7889,7 +7889,7 @@ gtk_tree_view_focus (GtkWidget        *widget,
 static void
 gtk_tree_view_grab_focus (GtkWidget *widget)
 {
-  (* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->grab_focus) (widget);
+  GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->grab_focus (widget);
 
   gtk_tree_view_focus_to_cursor (GTK_TREE_VIEW (widget));
 }
@@ -8471,7 +8471,7 @@ gtk_tree_view_row_deleted (GtkTreeModel *model,
       gint child_count = 0;
       if (node->children)
 	_gtk_rbtree_traverse (node->children, node->children->root, G_POST_ORDER, count_children_helper, &child_count);
-      (* tree_view->priv->destroy_count_func) (tree_view, path, child_count, tree_view->priv->destroy_count_data);
+      tree_view->priv->destroy_count_func (tree_view, path, child_count, tree_view->priv->destroy_count_data);
     }
 
   if (tree->root->count == 1)
@@ -9210,7 +9210,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
       /* If it's not the column moving and func tells us to skip over the column, we continue. */
       if (left_column != column && cur_column != column &&
 	  tree_view->priv->column_drop_func &&
-	  ! (* tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
+	  ! tree_view->priv->column_drop_func (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
 	{
 	  left_column = cur_column;
 	  continue;
@@ -9225,7 +9225,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
   /* Add the last one */
   if (tree_view->priv->column_drop_func == NULL ||
       ((left_column != column) &&
-       (* tree_view->priv->column_drop_func) (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data)))
+       tree_view->priv->column_drop_func (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data)))
     {
       reorder = g_slice_new0 (GtkTreeViewColumnReorder);
       reorder->left_column = left_column;
@@ -11557,7 +11557,7 @@ gtk_tree_view_set_column_drag_function (GtkTreeView               *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (tree_view->priv->column_drop_func_data_destroy)
-    (* tree_view->priv->column_drop_func_data_destroy) (tree_view->priv->column_drop_func_data);
+    tree_view->priv->column_drop_func_data_destroy (tree_view->priv->column_drop_func_data);
 
   tree_view->priv->column_drop_func = func;
   tree_view->priv->column_drop_func_data = user_data;
@@ -12205,7 +12205,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
       gtk_tree_path_down (child_path);
       if (node->children)
 	_gtk_rbtree_traverse (node->children, node->children->root, G_POST_ORDER, count_children_helper, &child_count);
-      (* tree_view->priv->destroy_count_func) (tree_view, child_path, child_count, tree_view->priv->destroy_count_data);
+      tree_view->priv->destroy_count_func (tree_view, child_path, child_count, tree_view->priv->destroy_count_data);
       gtk_tree_path_free (child_path);
     }
 
@@ -13849,7 +13849,7 @@ gtk_tree_view_set_destroy_count_func (GtkTreeView             *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (tree_view->priv->destroy_count_destroy)
-    (* tree_view->priv->destroy_count_destroy) (tree_view->priv->destroy_count_data);
+    tree_view->priv->destroy_count_destroy (tree_view->priv->destroy_count_data);
 
   tree_view->priv->destroy_count_func = func;
   tree_view->priv->destroy_count_data = data;
@@ -13988,7 +13988,7 @@ gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
   g_return_if_fail (search_equal_func != NULL);
 
   if (tree_view->priv->search_destroy)
-    (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
+    tree_view->priv->search_destroy (tree_view->priv->search_user_data);
 
   tree_view->priv->search_equal_func = search_equal_func;
   tree_view->priv->search_user_data = search_user_data;
@@ -14109,7 +14109,7 @@ gtk_tree_view_set_search_position_func (GtkTreeView                   *tree_view
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (tree_view->priv->search_position_destroy)
-    (* tree_view->priv->search_position_destroy) (tree_view->priv->search_position_user_data);
+    tree_view->priv->search_position_destroy (tree_view->priv->search_position_user_data);
 
   tree_view->priv->search_position_func = func;
   tree_view->priv->search_position_user_data = user_data;
@@ -15055,7 +15055,7 @@ gtk_tree_view_set_row_separator_func (GtkTreeView                 *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (tree_view->priv->row_separator_destroy)
-    (* tree_view->priv->row_separator_destroy) (tree_view->priv->row_separator_data);
+    tree_view->priv->row_separator_destroy (tree_view->priv->row_separator_data);
 
   tree_view->priv->row_separator_func = func;
   tree_view->priv->row_separator_data = data;
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 8b20c58adc..72605499af 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -638,7 +638,7 @@ gtk_viewport_unrealize (GtkWidget *widget)
   viewport->bin_window = NULL;
 
   if (GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize) (widget);
+    GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize (widget);
 }
 
 static void
@@ -674,8 +674,8 @@ gtk_viewport_expose (GtkWidget      *widget,
 			     GTK_STATE_NORMAL, GTK_SHADOW_NONE,
 			     &event->area, widget, "viewportbin",
 			     0, 0, -1, -1);
-	  
-	  (* GTK_WIDGET_CLASS (gtk_viewport_parent_class)->expose_event) (widget, event);
+
+	  GTK_WIDGET_CLASS (gtk_viewport_parent_class)->expose_event (widget, event);
 	}
     }
 
diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 4d48311895..621558fa2a 100644
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -138,9 +138,9 @@ gtk_win32_embed_widget_unrealize (GtkWidget *widget)
       g_object_unref (embed_widget->parent_window);
       embed_widget->parent_window = NULL;
     }
-  
+
   if (GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize) (widget);
+    GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize (widget);
 }
 
 static LRESULT CALLBACK
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 8ea2694d6d..4fb81559c5 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4716,8 +4716,8 @@ gtk_window_unrealize (GtkWidget *widget)
 
   /* Icons */
   gtk_window_unrealize_icon (window);
-  
-  (* GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize (widget);
 }
 
 static void