gtk+ r21035 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Thu Aug  7 14:12:32 2008
New Revision: 21035
URL: http://svn.gnome.org/viewvc/gtk+?rev=21035&view=rev

Log:
2008-08-07  Michael Natterer  <mitch imendio com>

	* gtk/gtkclist.c
	* gtk/gtkcontainer.c
	* gtk/gtkfilechooserbutton.c
	* gtk/gtkgamma.c
	* gtk/gtkmenutoolbutton.c
	* gtk/gtkoptionmenu.c
	* gtk/gtkradiobutton.c
	* gtk/gtkradiomenuitem.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeview.c: chain up unconditionally in destroy().

	* gtk/gtkhandlebox.c: remove empty destroy() implementation.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkclist.c
   trunk/gtk/gtkcontainer.c
   trunk/gtk/gtkfilechooserbutton.c
   trunk/gtk/gtkgamma.c
   trunk/gtk/gtkhandlebox.c
   trunk/gtk/gtkmenutoolbutton.c
   trunk/gtk/gtkoptionmenu.c
   trunk/gtk/gtkradiobutton.c
   trunk/gtk/gtkradiomenuitem.c
   trunk/gtk/gtktipsquery.c
   trunk/gtk/gtktree.c
   trunk/gtk/gtktreeview.c

Modified: trunk/gtk/gtkclist.c
==============================================================================
--- trunk/gtk/gtkclist.c	(original)
+++ trunk/gtk/gtkclist.c	Thu Aug  7 14:12:32 2008
@@ -4402,8 +4402,7 @@
 	clist->column[i].button = NULL;
       }
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void

Modified: trunk/gtk/gtkcontainer.c
==============================================================================
--- trunk/gtk/gtkcontainer.c	(original)
+++ trunk/gtk/gtkcontainer.c	Thu Aug  7 14:12:32 2008
@@ -1009,7 +1009,7 @@
 gtk_container_destroy (GtkObject *object)
 {
   GtkContainer *container = GTK_CONTAINER (object);
-  
+
   if (GTK_CONTAINER_RESIZE_PENDING (container))
     _gtk_container_dequeue_resize_handler (container);
 
@@ -1018,11 +1018,10 @@
    */
   if (container->has_focus_chain)
     gtk_container_unset_focus_chain (container);
-  
+
   gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
-  
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void

Modified: trunk/gtk/gtkfilechooserbutton.c
==============================================================================
--- trunk/gtk/gtkfilechooserbutton.c	(original)
+++ trunk/gtk/gtkfilechooserbutton.c	Thu Aug  7 14:12:32 2008
@@ -954,8 +954,7 @@
       priv->fs = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL)
-    (*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy (object);
 }
 
 

Modified: trunk/gtk/gtkgamma.c
==============================================================================
--- trunk/gtk/gtkgamma.c	(original)
+++ trunk/gtk/gtkgamma.c	Thu Aug  7 14:12:32 2008
@@ -485,8 +485,7 @@
   if (c->gamma_dialog)
     gtk_widget_destroy (c->gamma_dialog);
 
-  if (GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy (object);
 }
 
 #define __GTK_GAMMA_CURVE_C__

Modified: trunk/gtk/gtkhandlebox.c
==============================================================================
--- trunk/gtk/gtkhandlebox.c	(original)
+++ trunk/gtk/gtkhandlebox.c	Thu Aug  7 14:12:32 2008
@@ -113,7 +113,6 @@
 					   guint        param_id,
 					   GValue      *value,
 					   GParamSpec  *pspec);
-static void gtk_handle_box_destroy        (GtkObject         *object);
 static void gtk_handle_box_map            (GtkWidget         *widget);
 static void gtk_handle_box_unmap          (GtkWidget         *widget);
 static void gtk_handle_box_realize        (GtkWidget         *widget);
@@ -152,12 +151,10 @@
 gtk_handle_box_class_init (GtkHandleBoxClass *class)
 {
   GObjectClass *gobject_class;
-  GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
 
   gobject_class = (GObjectClass *) class;
-  object_class = (GtkObjectClass *) class;
   widget_class = (GtkWidgetClass *) class;
   container_class = (GtkContainerClass *) class;
 
@@ -214,8 +211,6 @@
 							 FALSE,
 							 GTK_PARAM_READABLE));
 
-  object_class->destroy = gtk_handle_box_destroy;
-
   widget_class->map = gtk_handle_box_map;
   widget_class->unmap = gtk_handle_box_unmap;
   widget_class->realize = gtk_handle_box_realize;
@@ -348,13 +343,6 @@
 }
 
 static void
-gtk_handle_box_destroy (GtkObject *object)
-{
-  if (GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy) (object);
-}
-
-static void
 gtk_handle_box_map (GtkWidget *widget)
 {
   GtkBin *bin;

Modified: trunk/gtk/gtkmenutoolbutton.c
==============================================================================
--- trunk/gtk/gtkmenutoolbutton.c	(original)
+++ trunk/gtk/gtkmenutoolbutton.c	Thu Aug  7 14:12:32 2008
@@ -423,9 +423,8 @@
 					    arrow_button_button_press_event_cb, 
 					    button);
     }
-  
-  if (GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy)
-    (*GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy (object);
 }
 
 /**

Modified: trunk/gtk/gtkoptionmenu.c
==============================================================================
--- trunk/gtk/gtkoptionmenu.c	(original)
+++ trunk/gtk/gtkoptionmenu.c	Thu Aug  7 14:12:32 2008
@@ -377,8 +377,7 @@
   if (option_menu->menu)
     gtk_widget_destroy (option_menu->menu);
 
-  if (GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy (object);
 }
 
 static void

Modified: trunk/gtk/gtkradiobutton.c
==============================================================================
--- trunk/gtk/gtkradiobutton.c	(original)
+++ trunk/gtk/gtkradiobutton.c	Thu Aug  7 14:12:32 2008
@@ -384,9 +384,8 @@
     g_signal_emit (old_group_singleton, group_changed_signal, 0);
   if (was_in_group)
     g_signal_emit (radio_button, group_changed_signal, 0);
-  
-  if (GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
 }
 
 static void

Modified: trunk/gtk/gtkradiomenuitem.c
==============================================================================
--- trunk/gtk/gtkradiomenuitem.c	(original)
+++ trunk/gtk/gtkradiomenuitem.c	Thu Aug  7 14:12:32 2008
@@ -410,9 +410,8 @@
     g_signal_emit (old_group_singleton, group_changed_signal, 0);
   if (was_in_group)
     g_signal_emit (radio_menu_item, group_changed_signal, 0);
-  
-  if (GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy (object);
 }
 
 static void

Modified: trunk/gtk/gtktipsquery.c
==============================================================================
--- trunk/gtk/gtktipsquery.c	(original)
+++ trunk/gtk/gtktipsquery.c	Thu Aug  7 14:12:32 2008
@@ -265,8 +265,7 @@
   g_free (tips_query->label_no_tip);
   tips_query->label_no_tip = NULL;
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 GtkWidget*

Modified: trunk/gtk/gtktree.c
==============================================================================
--- trunk/gtk/gtktree.c	(original)
+++ trunk/gtk/gtktree.c	Thu Aug  7 14:12:32 2008
@@ -408,9 +408,8 @@
       g_list_free (tree->selection);
       tree->selection = NULL;
     }
-  
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void

Modified: trunk/gtk/gtktreeview.c
==============================================================================
--- trunk/gtk/gtktreeview.c	(original)
+++ trunk/gtk/gtktreeview.c	Thu Aug  7 14:12:32 2008
@@ -1692,8 +1692,7 @@
       tree_view->priv->vadjustment = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy (object);
 }