2011-10-22 [colin] 3.7.10cvs41

[claws.git] / src / gtk / gtksctree.c

diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index 7fa8c1474069beeb0ca7fa124ba439c7b0e6b322..1dac4114b94a59ac7c345245f98ed208adde37cd 100644 (file)
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -887,7 +887,7 @@ gtk_sctree_draw_row (GtkCMCList     *clist,
   }
 
   /* bail now if we arn't drawable yet */
-  if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+  if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
     return;
 
   ctree  = GTK_CMCTREE  (clist);
@@ -1256,7 +1256,7 @@ gtk_sctree_draw_row (GtkCMCList     *clist,
 
   /* draw focus rectangle */
   if (clist->focus_row == row &&
-      gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus (widget))
+      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
     {
       if (!area)
        gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -1287,7 +1287,7 @@ gtk_sctree_change_focus_row_expansion (GtkCMCTree          *ctree,
   clist = GTK_CMCLIST (ctree);
 
   if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (ctree))) && 
-      gtkut_widget_has_grab (GTK_WIDGET(ctree)))
+      gtk_widget_has_grab (GTK_WIDGET(ctree)))
     return;
   
   if (!(node =
@@ -1647,7 +1647,7 @@ gtk_sctree_button_press (GtkWidget *widget, GdkEventButton *event)
 
        on_row = gtk_cmclist_get_selection_info (clist, event->x, event->y, &row, &col);
 
-       if (on_row && !gtkut_widget_has_focus(widget))
+       if (on_row && !gtk_widget_has_focus(widget))
                gtk_widget_grab_focus (widget);
 
        if (gtk_sctree_is_hot_spot (GTK_SCTREE(sctree), event->x, event->y)) {
@@ -2842,7 +2842,7 @@ srow_delete (GtkCMCTree    *ctree,
        (clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
       if (ctree_row->row.cell[i].style)
        {
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gtk_style_detach (ctree_row->row.cell[i].style);
          g_object_unref (ctree_row->row.cell[i].style);
        }
@@ -2850,7 +2850,7 @@ srow_delete (GtkCMCTree    *ctree,
 
   if (ctree_row->row.style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gtk_style_detach (ctree_row->row.style);
       g_object_unref (ctree_row->row.style);
     }