gdk/gdkwindow.c, gtk/gtkwidget.c: Include fallback-c89.c

[~andy/gtk] / gtk / gtkiconview.c

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index c6f41d30d0ee09d94d0ed6a951dc89b3a4beec43..0c6dc038ce354701c740569e7f2b9e35d77f2ef9 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1301,7 +1301,7 @@ gtk_icon_view_realize (GtkWidget *widget)
   window = gdk_window_new (gtk_widget_get_parent_window (widget),
                            &attributes, attributes_mask);
   gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, widget);
+  gtk_widget_register_window (widget, window);
 
   gtk_widget_get_allocation (widget, &allocation);
 
@@ -1322,7 +1322,7 @@ gtk_icon_view_realize (GtkWidget *widget)
   
   icon_view->priv->bin_window = gdk_window_new (window,
                                                &attributes, attributes_mask);
-  gdk_window_set_user_data (icon_view->priv->bin_window, widget);
+  gtk_widget_register_window (widget, icon_view->priv->bin_window);
 
   context = gtk_widget_get_style_context (widget);
   gtk_style_context_set_background (context, icon_view->priv->bin_window);
@@ -1338,7 +1338,7 @@ gtk_icon_view_unrealize (GtkWidget *widget)
 
   icon_view = GTK_ICON_VIEW (widget);
 
-  gdk_window_set_user_data (icon_view->priv->bin_window, NULL);
+  gtk_widget_unregister_window (widget, icon_view->priv->bin_window);
   gdk_window_destroy (icon_view->priv->bin_window);
   icon_view->priv->bin_window = NULL;
 
@@ -7236,25 +7236,25 @@ gtk_icon_view_set_reorderable (GtkIconView *icon_view,
 /**
  * gtk_icon_view_set_activate_on_single_click:
  * @icon_view: a #GtkIconView
- * @setting: %TRUE to emit item-activated on a single click
+ * @single: %TRUE to emit item-activated on a single click
  *
- * Causes the "item-activated" signal to be emitted on a single click
- * instead of a double click.
+ * Causes the #GtkIconView::item-activated signal to be emitted on
+ * a single click instead of a double click.
  *
  * Since: 3.8
  **/
 void
-gtk_icon_view_set_activate_on_single_click  (GtkIconView *icon_view,
-                                             gboolean     setting)
+gtk_icon_view_set_activate_on_single_click (GtkIconView *icon_view,
+                                            gboolean     single)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
 
-  setting = setting != FALSE;
+  single = single != FALSE;
 
-  if (icon_view->priv->activate_on_single_click == setting)
+  if (icon_view->priv->activate_on_single_click == single)
     return;
 
-  icon_view->priv->activate_on_single_click = setting;
+  icon_view->priv->activate_on_single_click = single;
   g_object_notify (G_OBJECT (icon_view), "activate-on-single-click");
 }
 
@@ -7269,7 +7269,7 @@ gtk_icon_view_set_activate_on_single_click  (GtkIconView *icon_view,
  * Since: 3.8
  **/
 gboolean
-gtk_icon_view_get_activate_on_single_click  (GtkIconView *icon_view)
+gtk_icon_view_get_activate_on_single_click (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), FALSE);