GNOME.org
 

gtk+ r21088 - in trunk: . gtk

Author: mitch
Date: Tue Aug 12 09:44:32 2008
New Revision: 21088
URL: http://svn.gnome.org/viewvc/gtk+?rev=21088&view=rev

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

	* gtk/gtkaccellabel.c
	* gtk/gtkcalendar.c
	* gtk/gtkclist.c
	* gtk/gtkentry.c
	* gtk/gtkeventbox.c
	* gtk/gtkfilechooserbutton.c
	* gtk/gtkfilechooserdefault.c
	* gtk/gtkhandlebox.c
	* gtk/gtkhsv.c
	* gtk/gtkiconview.c
	* gtk/gtkimage.c
	* gtk/gtklayout.c
	* gtk/gtklistitem.c
	* gtk/gtkmenuitem.c
	* gtk/gtkmessagedialog.c
	* gtk/gtknotebook.c
	* gtk/gtkpaned.c
	* gtk/gtkpathbar.c
	* gtk/gtkplug.c
	* gtk/gtkprintunixdialog.c
	* gtk/gtkrange.c
	* gtk/gtkrecentchooserdefault.c
	* gtk/gtkruler.c
	* gtk/gtksocket.c
	* gtk/gtktext.c
	* gtk/gtktextview.c
	* gtk/gtktoolbar.c
	* gtk/gtktreeitem.c
	* gtk/gtktreeview.c
	* gtk/gtkviewport.c
	* gtk/gtkwin32embedwidget.c: chain up unconditionally in
	realize(), unrealize(), map(), unmap(), style_set(),
	key_press_event() and size_request()



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkaccellabel.c
   trunk/gtk/gtkcalendar.c
   trunk/gtk/gtkclist.c
   trunk/gtk/gtkentry.c
   trunk/gtk/gtkeventbox.c
   trunk/gtk/gtkfilechooserbutton.c
   trunk/gtk/gtkfilechooserdefault.c
   trunk/gtk/gtkhandlebox.c
   trunk/gtk/gtkhsv.c
   trunk/gtk/gtkiconview.c
   trunk/gtk/gtkimage.c
   trunk/gtk/gtklayout.c
   trunk/gtk/gtklistitem.c
   trunk/gtk/gtkmenuitem.c
   trunk/gtk/gtkmessagedialog.c
   trunk/gtk/gtknotebook.c
   trunk/gtk/gtkpaned.c
   trunk/gtk/gtkpathbar.c
   trunk/gtk/gtkplug.c
   trunk/gtk/gtkprintunixdialog.c
   trunk/gtk/gtkrange.c
   trunk/gtk/gtkrecentchooserdefault.c
   trunk/gtk/gtkruler.c
   trunk/gtk/gtksocket.c
   trunk/gtk/gtktext.c
   trunk/gtk/gtktextview.c
   trunk/gtk/gtktoolbar.c
   trunk/gtk/gtktreeitem.c
   trunk/gtk/gtktreeview.c
   trunk/gtk/gtkviewport.c
   trunk/gtk/gtkwin32embedwidget.c

Modified: trunk/gtk/gtkaccellabel.c
==============================================================================
--- trunk/gtk/gtkaccellabel.c	(original)
+++ trunk/gtk/gtkaccellabel.c	Tue Aug 12 09:44:32 2008
@@ -266,9 +266,8 @@
   GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (widget);
   PangoLayout *layout;
   gint width;
-  
-  if (GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->size_request)
-    GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->size_request (widget, requisition);
+
+  GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->size_request (widget, requisition);
 
   layout = gtk_widget_create_pango_layout (widget, gtk_accel_label_get_string (accel_label));
   pango_layout_get_pixel_size (layout, &width, NULL);

Modified: trunk/gtk/gtkcalendar.c
==============================================================================
--- trunk/gtk/gtkcalendar.c	(original)
+++ trunk/gtk/gtkcalendar.c	Tue Aug 12 09:44:32 2008
@@ -1657,8 +1657,7 @@
       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*

Modified: trunk/gtk/gtkclist.c
==============================================================================
--- trunk/gtk/gtkclist.c	(original)
+++ trunk/gtk/gtkclist.c	Tue Aug 12 09:44:32 2008
@@ -4662,8 +4662,7 @@
   clist->fg_gc = NULL;
   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
@@ -4817,14 +4816,9 @@
 gtk_clist_style_set (GtkWidget *widget,
 		     GtkStyle  *previous_style)
 {
-  GtkCList *clist;
-
-  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);
+  GtkCList *clist = GTK_CLIST (widget);
 
-  clist = GTK_CLIST (widget);
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
 
   if (GTK_WIDGET_REALIZED (widget))
     {

Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c	(original)
+++ trunk/gtk/gtkentry.c	Tue Aug 12 09:44:32 2008
@@ -1384,8 +1384,7 @@
       entry->popup_menu = NULL;
     }
 
-  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

Modified: trunk/gtk/gtkeventbox.c
==============================================================================
--- trunk/gtk/gtkeventbox.c	(original)
+++ trunk/gtk/gtkeventbox.c	Tue Aug 12 09:44:32 2008
@@ -450,8 +450,7 @@
       priv->event_window = NULL;
     }
 
-  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

Modified: trunk/gtk/gtkfilechooserbutton.c
==============================================================================
--- trunk/gtk/gtkfilechooserbutton.c	(original)
+++ trunk/gtk/gtkfilechooserbutton.c	Tue Aug 12 09:44:32 2008
@@ -1159,8 +1159,7 @@
       priv->folder_has_been_set = TRUE;
     }
 
-  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
@@ -1369,9 +1368,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));

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Tue Aug 12 09:44:32 2008
@@ -5835,8 +5835,7 @@
   impl = GTK_FILE_CHOOSER_DEFAULT (widget);
 
   profile_msg ("    parent class style_set start", NULL);
-  if (GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->style_set)
-    GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->style_set (widget, previous_style);
+  GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->style_set (widget, previous_style);
   profile_msg ("    parent class style_set end", NULL);
 
   if (gtk_widget_has_screen (GTK_WIDGET (impl)))

Modified: trunk/gtk/gtkhandlebox.c
==============================================================================
--- trunk/gtk/gtkhandlebox.c	(original)
+++ trunk/gtk/gtkhandlebox.c	Tue Aug 12 09:44:32 2008
@@ -468,8 +468,7 @@
   gdk_window_destroy (hb->float_window);
   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

Modified: trunk/gtk/gtkhsv.c
==============================================================================
--- trunk/gtk/gtkhsv.c	(original)
+++ trunk/gtk/gtkhsv.c	Tue Aug 12 09:44:32 2008
@@ -330,9 +330,8 @@
   
   g_object_unref (priv->gc);
   priv->gc = NULL;
-  
-  if (GTK_WIDGET_CLASS (gtk_hsv_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_hsv_parent_class)->unrealize (widget);
+
+  GTK_WIDGET_CLASS (gtk_hsv_parent_class)->unrealize (widget);
 }
 
 /* Size_request handler for the HSV color selector */

Modified: trunk/gtk/gtkiconview.c
==============================================================================
--- trunk/gtk/gtkiconview.c	(original)
+++ trunk/gtk/gtkiconview.c	Tue Aug 12 09:44:32 2008
@@ -1231,9 +1231,7 @@
   gdk_window_destroy (icon_view->priv->bin_window);
   icon_view->priv->bin_window = NULL;
 
-  /* 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

Modified: trunk/gtk/gtkimage.c
==============================================================================
--- trunk/gtk/gtkimage.c	(original)
+++ trunk/gtk/gtkimage.c	Tue Aug 12 09:44:32 2008
@@ -1458,8 +1458,7 @@
 {
   gtk_image_reset_anim_iter (GTK_IMAGE (widget));
 
-  if (GTK_WIDGET_CLASS (gtk_image_parent_class)->unmap)
-    GTK_WIDGET_CLASS (gtk_image_parent_class)->unmap (widget);
+  GTK_WIDGET_CLASS (gtk_image_parent_class)->unmap (widget);
 }
 
 static void
@@ -1467,8 +1466,7 @@
 {
   gtk_image_reset_anim_iter (GTK_IMAGE (widget));
 
-  if (GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize (widget);
 }
 
 static gint
@@ -2228,9 +2226,8 @@
 
   image = GTK_IMAGE (widget);
 
-  if (GTK_WIDGET_CLASS (gtk_image_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_image_parent_class)->style_set (widget, prev_style);
-  
+  GTK_WIDGET_CLASS (gtk_image_parent_class)->style_set (widget, prev_style);
+
   icon_theme_changed (image);
 }
 

Modified: trunk/gtk/gtklayout.c
==============================================================================
--- trunk/gtk/gtklayout.c	(original)
+++ trunk/gtk/gtklayout.c	Tue Aug 12 09:44:32 2008
@@ -881,10 +881,10 @@
 }
 
 static void
-gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
+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))
     {
@@ -926,8 +926,7 @@
   gdk_window_destroy (layout->bin_window);
   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     

Modified: trunk/gtk/gtklistitem.c
==============================================================================
--- trunk/gtk/gtklistitem.c	(original)
+++ trunk/gtk/gtklistitem.c	Tue Aug 12 09:44:32 2008
@@ -427,8 +427,7 @@
   GdkWindowAttr attributes;
   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));
 

Modified: trunk/gtk/gtkmenuitem.c
==============================================================================
--- trunk/gtk/gtkmenuitem.c	(original)
+++ trunk/gtk/gtkmenuitem.c	Tue Aug 12 09:44:32 2008
@@ -853,8 +853,7 @@
   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

Modified: trunk/gtk/gtkmessagedialog.c
==============================================================================
--- trunk/gtk/gtkmessagedialog.c	(original)
+++ trunk/gtk/gtkmessagedialog.c	Tue Aug 12 09:44:32 2008
@@ -892,8 +892,7 @@
 
   setup_primary_label_font (dialog);
 
-  if (GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set)
-    (GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set) (widget, prev_style);
+  GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set (widget, prev_style);
 }
 
 #define __GTK_MESSAGE_DIALOG_C__

Modified: trunk/gtk/gtknotebook.c
==============================================================================
--- trunk/gtk/gtknotebook.c	(original)
+++ trunk/gtk/gtknotebook.c	Tue Aug 12 09:44:32 2008
@@ -1784,8 +1784,7 @@
       priv->drag_window = NULL;
     }
 
-  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

Modified: trunk/gtk/gtkpaned.c
==============================================================================
--- trunk/gtk/gtkpaned.c	(original)
+++ trunk/gtk/gtkpaned.c	Tue Aug 12 09:44:32 2008
@@ -773,8 +773,7 @@
   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

Modified: trunk/gtk/gtkpathbar.c
==============================================================================
--- trunk/gtk/gtkpathbar.c	(original)
+++ trunk/gtk/gtkpathbar.c	Tue Aug 12 09:44:32 2008
@@ -648,8 +648,7 @@
 gtk_path_bar_style_set (GtkWidget *widget,
 			GtkStyle  *previous_style)
 {
-  if (GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set (widget, previous_style);
+  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set (widget, previous_style);
 
   gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
 }

Modified: trunk/gtk/gtkplug.c
==============================================================================
--- trunk/gtk/gtkplug.c	(original)
+++ trunk/gtk/gtkplug.c	Tue Aug 12 09:44:32 2008
@@ -567,8 +567,7 @@
       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

Modified: trunk/gtk/gtkprintunixdialog.c
==============================================================================
--- trunk/gtk/gtkprintunixdialog.c	(original)
+++ trunk/gtk/gtkprintunixdialog.c	Tue Aug 12 09:44:32 2008
@@ -1630,8 +1630,7 @@
 gtk_print_unix_dialog_style_set (GtkWidget *widget,
 				 GtkStyle  *previous_style)
 {
-  if (GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set (widget, previous_style);
+  GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set (widget, previous_style);
 
   if (gtk_widget_has_screen (widget))
     {

Modified: trunk/gtk/gtkrange.c
==============================================================================
--- trunk/gtk/gtkrange.c	(original)
+++ trunk/gtk/gtkrange.c	Tue Aug 12 09:44:32 2008
@@ -1294,8 +1294,7 @@
   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

Modified: trunk/gtk/gtkrecentchooserdefault.c
==============================================================================
--- trunk/gtk/gtkrecentchooserdefault.c	(original)
+++ trunk/gtk/gtkrecentchooserdefault.c	Tue Aug 12 09:44:32 2008
@@ -925,9 +925,8 @@
 gtk_recent_chooser_default_map (GtkWidget *widget)
 {
   GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (widget);
-  
-  if (GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map)
-    GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
+
+  GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
 
   /* reloads everything */
   reload_recent_items (impl);

Modified: trunk/gtk/gtkruler.c
==============================================================================
--- trunk/gtk/gtkruler.c	(original)
+++ trunk/gtk/gtkruler.c	Tue Aug 12 09:44:32 2008
@@ -407,8 +407,7 @@
       ruler->non_gr_exp_gc = NULL;
     }
 
-  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

Modified: trunk/gtk/gtksocket.c
==============================================================================
--- trunk/gtk/gtksocket.c	(original)
+++ trunk/gtk/gtksocket.c	Tue Aug 12 09:44:32 2008
@@ -407,8 +407,7 @@
       _gtk_socket_end_embedding (socket);
     }
 
-  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

Modified: trunk/gtk/gtktext.c
==============================================================================
--- trunk/gtk/gtktext.c	(original)
+++ trunk/gtk/gtktext.c	Tue Aug 12 09:44:32 2008
@@ -1374,8 +1374,7 @@
 
   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

Modified: trunk/gtk/gtktextview.c
==============================================================================
--- trunk/gtk/gtktextview.c	(original)
+++ trunk/gtk/gtktextview.c	Tue Aug 12 09:44:32 2008
@@ -4095,9 +4095,10 @@
       retval = TRUE;
     }
   /* Binding set */
-  else if (GTK_WIDGET_CLASS (gtk_text_view_parent_class)->key_press_event &&
- 	   GTK_WIDGET_CLASS (gtk_text_view_parent_class)->key_press_event (widget, event))
-    retval = TRUE;
+  else if (GTK_WIDGET_CLASS (gtk_text_view_parent_class)->key_press_event (widget, event))
+    {
+      retval = TRUE;
+    }
   /* use overall editability not can_insert, more predictable for users */
   else if (text_view->editable &&
            (event->keyval == GDK_Return ||

Modified: trunk/gtk/gtktoolbar.c
==============================================================================
--- trunk/gtk/gtktoolbar.c	(original)
+++ trunk/gtk/gtktoolbar.c	Tue Aug 12 09:44:32 2008
@@ -861,9 +861,8 @@
       gdk_window_destroy (priv->event_window);
       priv->event_window = NULL;
     }
-  
-  if (GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize (widget);
+
+  GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize (widget);
 }
 
 static gint

Modified: trunk/gtk/gtktreeitem.c
==============================================================================
--- trunk/gtk/gtktreeitem.c	(original)
+++ trunk/gtk/gtktreeitem.c	Tue Aug 12 09:44:32 2008
@@ -442,8 +442,7 @@
 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]);

Modified: trunk/gtk/gtktreeview.c
==============================================================================
--- trunk/gtk/gtktreeview.c	(original)
+++ trunk/gtk/gtktreeview.c	Tue Aug 12 09:44:32 2008
@@ -1938,9 +1938,7 @@
       priv->grid_line_gc = NULL;
     }
 
-  /* 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 */

Modified: trunk/gtk/gtkviewport.c
==============================================================================
--- trunk/gtk/gtkviewport.c	(original)
+++ trunk/gtk/gtkviewport.c	Tue Aug 12 09:44:32 2008
@@ -637,8 +637,7 @@
   gdk_window_destroy (viewport->bin_window);
   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

Modified: trunk/gtk/gtkwin32embedwidget.c
==============================================================================
--- trunk/gtk/gtkwin32embedwidget.c	(original)
+++ trunk/gtk/gtkwin32embedwidget.c	Tue Aug 12 09:44:32 2008
@@ -139,8 +139,7 @@
       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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]