2011-10-22 [colin] 3.7.10cvs41

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

diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index f3bd8c676b0d566852bb978f2345a90cac0fafc9..6ac475455b278c9b55905a415e09e585da021a81 100644 (file)
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -896,7 +896,7 @@ gtk_cmctree_unrealize (GtkWidget *widget)
   ctree = GTK_CMCTREE (widget);
   clist = GTK_CMCLIST (widget);
 
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       GtkCMCTreeNode *node;
       GtkCMCTreeNode *child;
@@ -1764,7 +1764,7 @@ draw_row (GtkCMCList     *clist,
   cm_return_if_fail (clist != NULL);
 
   /* 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;
 
   widget = GTK_WIDGET (clist);
@@ -2122,7 +2122,7 @@ 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,
@@ -2601,7 +2601,7 @@ 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 =
@@ -3318,7 +3318,7 @@ row_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);
        }
@@ -3326,7 +3326,7 @@ row_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);
     }
@@ -4819,7 +4819,7 @@ static void
 remove_grab (GtkCMCList *clist)
 {
   if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) && 
-      gtkut_widget_has_grab (GTK_WIDGET(clist)))
+      gtk_widget_has_grab (GTK_WIDGET(clist)))
     {
       gtk_grab_remove (GTK_WIDGET (clist));
       gdk_display_pointer_ungrab (gtk_widget_get_display (GTK_WIDGET (clist)),
@@ -5027,7 +5027,7 @@ gtk_cmctree_node_set_cell_style (GtkCMCTree     *ctree,
 
   if (GTK_CMCTREE_ROW (node)->row.cell[column].style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         gtk_style_detach (GTK_CMCTREE_ROW (node)->row.cell[column].style);
       g_object_unref (GTK_CMCTREE_ROW (node)->row.cell[column].style);
     }
@@ -5038,7 +5038,7 @@ gtk_cmctree_node_set_cell_style (GtkCMCTree     *ctree,
     {
       g_object_ref (GTK_CMCTREE_ROW (node)->row.cell[column].style);
       
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         GTK_CMCTREE_ROW (node)->row.cell[column].style =
          gtk_style_attach (GTK_CMCTREE_ROW (node)->row.cell[column].style,
                            clist->clist_window);
@@ -5099,7 +5099,7 @@ gtk_cmctree_node_set_row_style (GtkCMCTree     *ctree,
 
   if (GTK_CMCTREE_ROW (node)->row.style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         gtk_style_detach (GTK_CMCTREE_ROW (node)->row.style);
       g_object_unref (GTK_CMCTREE_ROW (node)->row.style);
     }
@@ -5110,7 +5110,7 @@ gtk_cmctree_node_set_row_style (GtkCMCTree     *ctree,
     {
       g_object_ref (GTK_CMCTREE_ROW (node)->row.style);
       
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         GTK_CMCTREE_ROW (node)->row.style =
          gtk_style_attach (GTK_CMCTREE_ROW (node)->row.style,
                            clist->clist_window);
@@ -5149,7 +5149,7 @@ gtk_cmctree_node_set_foreground (GtkCMCTree       *ctree,
     {
       GTK_CMCTREE_ROW (node)->row.foreground = *color;
       GTK_CMCTREE_ROW (node)->row.fg_set = TRUE;
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (ctree)),
                         &GTK_CMCTREE_ROW (node)->row.foreground, TRUE, TRUE);
     }
@@ -5171,7 +5171,7 @@ gtk_cmctree_node_set_background (GtkCMCTree       *ctree,
     {
       GTK_CMCTREE_ROW (node)->row.background = *color;
       GTK_CMCTREE_ROW (node)->row.bg_set = TRUE;
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (ctree)),
                         &GTK_CMCTREE_ROW (node)->row.background, TRUE, TRUE);
     }
@@ -5364,23 +5364,23 @@ gtk_cmctree_set_line_style (GtkCMCTree          *ctree,
           clist->column[ctree->tree_column].width + 3);
     }
 
-  if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+  if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
     {
       switch (line_style)
        {
        case GTK_CMCTREE_LINES_SOLID:
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID, 
                                        GDK_CAP_BUTT, GDK_JOIN_MITER);
          break;
        case GTK_CMCTREE_LINES_DOTTED:
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, 
                                        GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
          gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
          break;
        case GTK_CMCTREE_LINES_TABBED:
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID, 
                                        GDK_CAP_BUTT, GDK_JOIN_MITER);
          break;
@@ -5445,7 +5445,7 @@ gtk_cmctree_set_expander_style (GtkCMCTree              *ctree,
       gtk_cmclist_set_column_width (clist, ctree->tree_column, new_width);
     }
 
-  if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+  if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
     CLIST_REFRESH (clist);
 }
 
@@ -5776,7 +5776,7 @@ real_undo_selection (GtkCMCList *clist)
     if (GTK_CMCTREE_ROW (work->data)->row.selectable)
       gtk_cmctree_unselect (ctree, GTK_CMCTREE_NODE (work->data));
 
-  if (gtkut_widget_has_focus (GTK_WIDGET(clist)) &&
+  if (gtk_widget_has_focus (GTK_WIDGET(clist)) &&
       clist->focus_row != clist->undo_anchor)
     {
       clist->focus_row = clist->undo_anchor;