Deprecate flag macros for toplevel, state, no window and composite child

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

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 22691fc3bb8860b7d29bd9ac0fa1e91e09fee552..7b2ae9cea97b8929b9a72d436885c97e81daa974 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -231,13 +231,13 @@ gtk_tree_item_init (GtkTreeItem *tree_item)
   eventbox = gtk_event_box_new();
   gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK);
   gtk_signal_connect(GTK_OBJECT(eventbox), "state-changed",
-                    (GtkSignalFunc)gtk_tree_item_subtree_button_changed_state, 
+                    G_CALLBACK (gtk_tree_item_subtree_button_changed_state),
                     (gpointer)NULL);
   gtk_signal_connect(GTK_OBJECT(eventbox), "realize",
-                    (GtkSignalFunc)gtk_tree_item_subtree_button_changed_state, 
+                    G_CALLBACK (gtk_tree_item_subtree_button_changed_state),
                     (gpointer)NULL);
   gtk_signal_connect(GTK_OBJECT(eventbox), "button-press-event",
-                    (GtkSignalFunc)gtk_tree_item_subtree_button_click,
+                    G_CALLBACK (gtk_tree_item_subtree_button_click),
                     (gpointer)NULL);
   gtk_object_set_user_data(GTK_OBJECT(eventbox), tree_item);
   tree_item->pixmaps_box = eventbox;
@@ -682,7 +682,7 @@ gtk_tree_item_expose_child (GtkWidget *child,
   } *data = client_data;
 
   if (GTK_WIDGET_DRAWABLE (child) &&
-      GTK_WIDGET_NO_WINDOW (child) &&
+      !gtk_widget_get_has_window (child) &&
       (child->window == data->event->window))
     {
       GdkEvent *child_event = gdk_event_new (GDK_EXPOSE);