gtk+ r20969 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Mon Aug  4 14:23:55 2008
New Revision: 20969
URL: http://svn.gnome.org/viewvc/gtk+?rev=20969&view=rev

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

	* gtk/gtkclist.c
	* gtk/gtklist.c
	* gtk/gtkoldeditable.c
	* gtk/gtkpixmap.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeitem.c: avoid using deprecated GtkWidget API.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkclist.c
   trunk/gtk/gtklist.c
   trunk/gtk/gtkoldeditable.c
   trunk/gtk/gtkpixmap.c
   trunk/gtk/gtktipsquery.c
   trunk/gtk/gtktree.c
   trunk/gtk/gtktreeitem.c

Modified: trunk/gtk/gtkclist.c
==============================================================================
--- trunk/gtk/gtkclist.c	(original)
+++ trunk/gtk/gtkclist.c	Mon Aug  4 14:23:55 2008
@@ -2288,9 +2288,9 @@
 
   clist_row = ROW_ELEMENT (clist, row)->data;
   
-  gdk_pixmap_ref (pixmap);
+  g_object_ref (pixmap);
   
-  if (mask) gdk_pixmap_ref (mask);
+  if (mask) g_object_ref (mask);
   
   GTK_CLIST_GET_CLASS (clist)->set_cell_contents
     (clist, clist_row, column, GTK_CELL_PIXMAP, NULL, 0, pixmap, mask);
@@ -2354,8 +2354,8 @@
 
   clist_row = ROW_ELEMENT (clist, row)->data;
   
-  gdk_pixmap_ref (pixmap);
-  if (mask) gdk_pixmap_ref (mask);
+  g_object_ref (pixmap);
+  if (mask) g_object_ref (mask);
   GTK_CLIST_GET_CLASS (clist)->set_cell_contents
     (clist, clist_row, column, GTK_CELL_PIXTEXT, text, spacing, pixmap, mask);
 
@@ -2529,9 +2529,9 @@
 
   g_free (old_text);
   if (old_pixmap)
-    gdk_pixmap_unref (old_pixmap);
+    g_object_unref (old_pixmap);
   if (old_mask)
-    gdk_pixmap_unref (old_mask);
+    g_object_unref (old_mask);
 }
 
 PangoLayout *

Modified: trunk/gtk/gtklist.c
==============================================================================
--- trunk/gtk/gtklist.c	(original)
+++ trunk/gtk/gtklist.c	Mon Aug  4 14:23:55 2008
@@ -873,7 +873,7 @@
 	}
       container->focus_child = child;
       if (container->focus_child)
-        gtk_widget_ref (container->focus_child);
+        g_object_ref (container->focus_child);
     }
 
   /* check for v adjustment */
@@ -1168,7 +1168,7 @@
       widget = tmp_list->data;
       tmp_list = tmp_list->next;
 
-      gtk_widget_ref (widget);
+      g_object_ref (widget);
 
       if (widget->state == GTK_STATE_SELECTED)
 	gtk_list_unselect_child (list, widget);
@@ -1289,9 +1289,9 @@
       widget = tmp_list->data;
       tmp_list = tmp_list->next;
 
-      gtk_widget_ref (widget);
+      g_object_ref (widget);
       if (no_unref)
-	gtk_widget_ref (widget);
+	g_object_ref (widget);
 
       if (widget == new_focus_child) 
 	{
@@ -2474,7 +2474,7 @@
       if (!sel_list)
 	{
 	  list->selection = g_list_prepend (list->selection, list_item);
-	  gtk_widget_ref (GTK_WIDGET (list_item));
+	  g_object_ref (list_item);
 	}
       gtk_signal_emit (GTK_OBJECT (list), list_signals[SELECTION_CHANGED]);
       break;

Modified: trunk/gtk/gtkoldeditable.c
==============================================================================
--- trunk/gtk/gtkoldeditable.c	(original)
+++ trunk/gtk/gtkoldeditable.c	Mon Aug  4 14:23:55 2008
@@ -392,7 +392,7 @@
   gchar buf[64];
   gchar *text;
 
-  gtk_widget_ref (GTK_WIDGET (editable));
+  g_object_ref (editable);
 
   if (new_text_length <= 63)
     text = buf;
@@ -419,7 +419,7 @@
 {
   GtkOldEditable *old_editable = GTK_OLD_EDITABLE (editable);
 
-  gtk_widget_ref (GTK_WIDGET (old_editable));
+  g_object_ref (old_editable);
 
   g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos);
   g_signal_emit_by_name (editable, "changed");

Modified: trunk/gtk/gtkpixmap.c
==============================================================================
--- trunk/gtk/gtkpixmap.c	(original)
+++ trunk/gtk/gtkpixmap.c	Mon Aug  4 14:23:55 2008
@@ -135,7 +135,7 @@
 	      (GTK_WIDGET (pixmap)->requisition.height != oldheight))
 	    gtk_widget_queue_resize (GTK_WIDGET (pixmap));
 	  else
-	    gtk_widget_queue_clear (GTK_WIDGET (pixmap));
+	    gtk_widget_queue_draw (GTK_WIDGET (pixmap));
 	}
     }
 
@@ -231,7 +231,7 @@
 
   if (GTK_WIDGET_VISIBLE (pixmap))
     {
-      gtk_widget_queue_clear (GTK_WIDGET (pixmap));
+      gtk_widget_queue_draw (GTK_WIDGET (pixmap));
     }
 }
 

Modified: trunk/gtk/gtktipsquery.c
==============================================================================
--- trunk/gtk/gtktipsquery.c	(original)
+++ trunk/gtk/gtktipsquery.c	Mon Aug  4 14:23:55 2008
@@ -308,10 +308,10 @@
     g_return_if_fail (GTK_IS_WIDGET (caller));
 
   if (caller)
-    gtk_widget_ref (caller);
+    g_object_ref (caller);
 
   if (tips_query->caller)
-    gtk_widget_unref (tips_query->caller);
+    g_object_unref (tips_query->caller);
 
   tips_query->caller = caller;
 }
@@ -376,7 +376,7 @@
     }
   if (tips_query->last_crossed)
     {
-      gtk_widget_unref (tips_query->last_crossed);
+      g_object_unref (tips_query->last_crossed);
       tips_query->last_crossed = NULL;
     }
   
@@ -419,12 +419,12 @@
 		       NULL,
 		       NULL,
 		       NULL);
-      gtk_widget_unref (tips_query->last_crossed);
+      g_object_unref (tips_query->last_crossed);
       tips_query->last_crossed = NULL;
     }
   else if (widget && widget != tips_query->last_crossed)
     {
-      gtk_widget_ref (widget);
+      g_object_ref (widget);
       if (tdata || tips_query->emit_always)
 	  gtk_signal_emit (GTK_OBJECT (tips_query),
 			   tips_query_signals[SIGNAL_WIDGET_ENTERED],
@@ -432,7 +432,7 @@
 			   tdata ? tdata->tip_text : NULL,
 			   tdata ? tdata->tip_private : NULL);
       if (tips_query->last_crossed)
-	gtk_widget_unref (tips_query->last_crossed);
+	g_object_unref (tips_query->last_crossed);
       tips_query->last_crossed = widget;
     }
 }

Modified: trunk/gtk/gtktree.c
==============================================================================
--- trunk/gtk/gtktree.c	(original)
+++ trunk/gtk/gtktree.c	Mon Aug  4 14:23:55 2008
@@ -391,7 +391,7 @@
       child = children->data;
       children = children->next;
       
-      gtk_widget_ref (child);
+      g_object_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
       g_object_unref (child);
@@ -1022,7 +1022,7 @@
 	{
 	  gtk_tree_item_select (GTK_TREE_ITEM (child));
 	  root_selection = g_list_prepend (root_selection, child);
-	  gtk_widget_ref (child);
+	  g_object_ref (child);
 	}
       else if (child->state == GTK_STATE_SELECTED)
 	{
@@ -1067,7 +1067,7 @@
 	{
 	  gtk_tree_item_select (GTK_TREE_ITEM (child));
 	  root_selection = g_list_prepend (root_selection, child);
-	  gtk_widget_ref (child);
+	  g_object_ref (child);
 	  tree->root_tree->selection = root_selection;
 	  gtk_signal_emit (GTK_OBJECT (tree->root_tree), 
 			   tree_signals[SELECTION_CHANGED]);

Modified: trunk/gtk/gtktreeitem.c
==============================================================================
--- trunk/gtk/gtktreeitem.c	(original)
+++ trunk/gtk/gtktreeitem.c	Mon Aug  4 14:23:55 2008
@@ -643,7 +643,12 @@
 	  if (tree_item->pixmaps_box && 
 	      GTK_WIDGET_VISIBLE(tree_item->pixmaps_box) &&
 	      gtk_widget_intersect (tree_item->pixmaps_box, area, &child_area))
-	    gtk_widget_draw (tree_item->pixmaps_box, &child_area);
+            {
+              gtk_widget_queue_draw_area (tree_item->pixmaps_box,
+                                          child_area.x, child_area.y,
+                                          child_area.width, child_area.height);
+              gdk_window_process_updates (tree_item->pixmaps_box->window, TRUE);
+            }
 	}
 
       if (GTK_WIDGET_HAS_FOCUS (widget))
@@ -847,7 +852,7 @@
   child = item->subtree;
   if (child)
     {
-      gtk_widget_ref (child);
+      g_object_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
       g_object_unref (child);
@@ -858,7 +863,7 @@
   child = item->pixmaps_box;
   if (child)
     {
-      gtk_widget_ref (child);
+      g_object_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
       g_object_unref (child);