GNOME.org
 

gtk+ r20763 - in trunk: . gtk

Author: mitch
Date: Fri Jul  4 18:38:36 2008
New Revision: 20763
URL: http://svn.gnome.org/viewvc/gtk+?rev=20763&view=rev

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

	Fix make check:

	* gtk/Makefile.am: remove GTK_DISABLE_DEPRECATED from INCLUDES
	again :-(

	* gtk/gtkclist.c
	* gtk/gtkcombo.c
	* gtk/gtkctree.c
	* gtk/gtklist.c
	* gtk/gtklistitem.c
	* gtk/gtknotebook.c
	* gtk/gtkobject.c
	* gtk/gtkoldeditable.c
	* gtk/gtkpixmap.c
	* gtk/gtktext.c
	* gtk/gtktree.c
	* gtk/gtktreeitem.c: don't #define it again before including
	gtkalias.h after it has been #undef'ed before.



Modified:
   trunk/ChangeLog
   trunk/gtk/Makefile.am
   trunk/gtk/gtkclist.c
   trunk/gtk/gtkcombo.c
   trunk/gtk/gtkctree.c
   trunk/gtk/gtklist.c
   trunk/gtk/gtklistitem.c
   trunk/gtk/gtknotebook.c
   trunk/gtk/gtkobject.c
   trunk/gtk/gtkoldeditable.c
   trunk/gtk/gtkpixmap.c
   trunk/gtk/gtktext.c
   trunk/gtk/gtktree.c
   trunk/gtk/gtktreeitem.c

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Fri Jul  4 18:38:36 2008
@@ -35,7 +35,6 @@
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\

Modified: trunk/gtk/gtkclist.c
==============================================================================
--- trunk/gtk/gtkclist.c	(original)
+++ trunk/gtk/gtkclist.c	Fri Jul  4 18:38:36 2008
@@ -34,8 +34,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gtkmain.h"
 #include "gtkobject.h"
 #include "gtkctree.h"
@@ -45,7 +43,6 @@
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 /* length of button_actions array */
@@ -1162,7 +1159,7 @@
   if (clist->hadjustment)
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (clist->hadjustment), clist);
-      gtk_object_unref (GTK_OBJECT (clist->hadjustment));
+      g_object_unref (clist->hadjustment);
     }
 
   clist->hadjustment = adjustment;
@@ -1209,7 +1206,7 @@
   if (clist->vadjustment)
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (clist->vadjustment), clist);
-      gtk_object_unref (GTK_OBJECT (clist->vadjustment));
+      g_object_unref (clist->vadjustment);
     }
 
   clist->vadjustment = adjustment;
@@ -2598,7 +2595,7 @@
       requisition->width = logical_rect.width;
       requisition->height = logical_rect.height;
       
-      g_object_unref (G_OBJECT (layout));
+      g_object_unref (layout);
     }
   else
     {
@@ -4384,13 +4381,13 @@
   if (clist->hadjustment)
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (clist->hadjustment), clist);
-      gtk_object_unref (GTK_OBJECT (clist->hadjustment));
+      g_object_unref (clist->hadjustment);
       clist->hadjustment = NULL;
     }
   if (clist->vadjustment)
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (clist->vadjustment), clist);
-      gtk_object_unref (GTK_OBJECT (clist->vadjustment));
+      g_object_unref (clist->vadjustment);
       clist->vadjustment = NULL;
     }
 
@@ -5852,7 +5849,7 @@
 			       offset,
 			       row_rectangle.y + row_center_offset + clist_row->cell[i].vertical,
 			       layout);
-              g_object_unref (G_OBJECT (layout));
+              g_object_unref (layout);
 	      gdk_gc_set_clip_rectangle (fg_gc, NULL);
 	    }
 	  break;

Modified: trunk/gtk/gtkcombo.c
==============================================================================
--- trunk/gtk/gtkcombo.c	(original)
+++ trunk/gtk/gtkcombo.c	Fri Jul  4 18:38:36 2008
@@ -50,7 +50,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 static const gchar gtk_combo_string_key[] = "gtk-combo-string-value";

Modified: trunk/gtk/gtkctree.c
==============================================================================
--- trunk/gtk/gtkctree.c	(original)
+++ trunk/gtk/gtkctree.c	Fri Jul  4 18:38:36 2008
@@ -29,7 +29,6 @@
  */
 
 #undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
 
 #include "config.h"
 #include <stdlib.h>
@@ -41,7 +40,6 @@
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define PM_SIZE                    8

Modified: trunk/gtk/gtklist.c
==============================================================================
--- trunk/gtk/gtklist.c	(original)
+++ trunk/gtk/gtklist.c	Fri Jul  4 18:38:36 2008
@@ -24,8 +24,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include <string.h> /* memset */
 
@@ -37,7 +35,6 @@
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {
@@ -872,7 +869,7 @@
       if (container->focus_child)
 	{
 	  list->last_focus_child = container->focus_child;
-	  gtk_widget_unref (container->focus_child);
+	  g_object_unref (container->focus_child);
 	}
       container->focus_child = child;
       if (container->focus_child)
@@ -1184,7 +1181,7 @@
       if (widget == list->last_focus_child)
 	list->last_focus_child = NULL;
 
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
 
   g_list_free (start_list);
@@ -1320,7 +1317,7 @@
       if (widget == list->last_focus_child)
 	list->last_focus_child = NULL;
 
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
   
   if (new_focus_child && new_focus_child != old_focus_child)
@@ -2505,7 +2502,7 @@
     {
       list->selection = g_list_remove_link (list->selection, node);
       g_list_free_1 (node);
-      gtk_widget_unref (GTK_WIDGET (list_item));
+      g_object_unref (list_item);
       gtk_signal_emit (GTK_OBJECT (list), list_signals[SELECTION_CHANGED]);
     }
 }

Modified: trunk/gtk/gtklistitem.c
==============================================================================
--- trunk/gtk/gtklistitem.c	(original)
+++ trunk/gtk/gtklistitem.c	Fri Jul  4 18:38:36 2008
@@ -28,8 +28,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gtkbindings.h"
 #include "gtklabel.h"
 #include "gtklistitem.h"
@@ -38,7 +36,6 @@
 #include "gtksignal.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

Modified: trunk/gtk/gtknotebook.c
==============================================================================
--- trunk/gtk/gtknotebook.c	(original)
+++ trunk/gtk/gtknotebook.c	Fri Jul  4 18:38:36 2008
@@ -46,7 +46,6 @@
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define SCROLL_DELAY_FACTOR   5

Modified: trunk/gtk/gtkobject.c
==============================================================================
--- trunk/gtk/gtkobject.c	(original)
+++ trunk/gtk/gtkobject.c	Fri Jul  4 18:38:36 2008
@@ -37,7 +37,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

Modified: trunk/gtk/gtkoldeditable.c
==============================================================================
--- trunk/gtk/gtkoldeditable.c	(original)
+++ trunk/gtk/gtkoldeditable.c	Fri Jul  4 18:38:36 2008
@@ -38,7 +38,6 @@
 #include "gtksignal.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define MIN_EDITABLE_WIDTH  150
@@ -397,7 +396,7 @@
   if (new_text_length > 63)
     g_free (text);
 
-  gtk_widget_unref (GTK_WIDGET (editable));
+  g_object_unref (editable);
 }
 
 static void
@@ -416,7 +415,7 @@
       old_editable->has_selection)
     gtk_old_editable_claim_selection (old_editable, FALSE, GDK_CURRENT_TIME);
   
-  gtk_widget_unref (GTK_WIDGET (old_editable));
+  g_object_unref (old_editable);
 }
 
 static void

Modified: trunk/gtk/gtkpixmap.c
==============================================================================
--- trunk/gtk/gtkpixmap.c	(original)
+++ trunk/gtk/gtkpixmap.c	Fri Jul  4 18:38:36 2008
@@ -28,7 +28,6 @@
  */
 
 #undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
 
 #include "config.h"
 #include <math.h>
@@ -36,7 +35,6 @@
 #include "gtkpixmap.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

Modified: trunk/gtk/gtktext.c
==============================================================================
--- trunk/gtk/gtktext.c	(original)
+++ trunk/gtk/gtktext.c	Fri Jul  4 18:38:36 2008
@@ -48,7 +48,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 
@@ -797,13 +796,13 @@
   if (text->hadj && (text->hadj != hadj))
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
-      gtk_object_unref (GTK_OBJECT (text->hadj));
+      g_object_unref (text->hadj);
     }
   
   if (text->vadj && (text->vadj != vadj))
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
-      gtk_object_unref (GTK_OBJECT (text->vadj));
+      g_object_unref (text->vadj);
     }
   
   g_object_freeze_notify (G_OBJECT (text));
@@ -1175,13 +1174,13 @@
   if (text->hadj)
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
-      gtk_object_unref (GTK_OBJECT (text->hadj));
+      g_object_unref (text->hadj);
       text->hadj = NULL;
     }
   if (text->vadj)
     {
       gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
-      gtk_object_unref (GTK_OBJECT (text->vadj));
+      g_object_unref (text->vadj);
       text->vadj = NULL;
     }
 

Modified: trunk/gtk/gtktree.c
==============================================================================
--- trunk/gtk/gtktree.c	(original)
+++ trunk/gtk/gtktree.c	Fri Jul  4 18:38:36 2008
@@ -37,7 +37,6 @@
 #include "gtktreeitem.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {
@@ -395,7 +394,7 @@
       gtk_widget_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
-      gtk_widget_unref (child);
+      g_object_unref (child);
     }
   
   g_list_free (tree->children);
@@ -405,7 +404,7 @@
     {
       GList *node;
       for (node = tree->selection; node; node = node->next)
-	gtk_widget_unref ((GtkWidget *)node->data);
+	g_object_unref (node->data);
       g_list_free (tree->selection);
       tree->selection = NULL;
     }
@@ -459,7 +458,7 @@
 	  GTK_TREE (tmp_item->parent)->root_tree == tree)
 	gtk_tree_item_deselect (GTK_TREE_ITEM (tmp_item));
 
-      gtk_widget_unref (tmp_item);
+      g_object_unref (tmp_item);
 
       tmp_list = tmp_list->next;
     }
@@ -778,7 +777,7 @@
 	  root_tree->selection = g_list_remove (root_tree->selection, widget);
 	  
 	  /* unref it to authorize is destruction */
-	  gtk_widget_unref (widget);
+	  g_object_unref (widget);
 	}
       
       /* emit only one selection_changed signal */
@@ -1011,7 +1010,7 @@
 	      selection = selection->next;
 	      
 	      root_selection = g_list_remove_link (root_selection, tmp_list);
-	      gtk_widget_unref (tmp_item);
+	      g_object_unref (tmp_item);
 	      
 	      g_list_free (tmp_list);
 	    }
@@ -1029,7 +1028,7 @@
 	{
 	  gtk_tree_item_deselect (GTK_TREE_ITEM (child));
 	  root_selection = g_list_remove (root_selection, child);
-	  gtk_widget_unref (child);
+	  g_object_unref (child);
 	}
       
       tree->root_tree->selection = root_selection;
@@ -1054,7 +1053,7 @@
 	      selection = selection->next;
 	      
 	      root_selection = g_list_remove_link (root_selection, tmp_list);
-	      gtk_widget_unref (tmp_item);
+	      g_object_unref (tmp_item);
 	      
 	      g_list_free (tmp_list);
 	    }
@@ -1096,7 +1095,7 @@
 	  GtkTree* root_tree = GTK_TREE_ROOT_TREE(tree);
 	  gtk_tree_item_deselect (GTK_TREE_ITEM (child));
 	  root_tree->selection = g_list_remove (root_tree->selection, child);
-	  gtk_widget_unref (child);
+	  g_object_unref (child);
 	  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	Fri Jul  4 18:38:36 2008
@@ -39,7 +39,6 @@
 #include "gtktreeitem.h"
 #include "gtkintl.h"
 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #include "tree_plus.xpm"
@@ -851,7 +850,7 @@
       gtk_widget_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
-      gtk_widget_unref (child);
+      g_object_unref (child);
       item->subtree = NULL;
     }
   
@@ -862,7 +861,7 @@
       gtk_widget_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
-      gtk_widget_unref (child);
+      g_object_unref (child);
       item->pixmaps_box = NULL;
     }
   
@@ -871,7 +870,7 @@
   if (item->plus_pix_widget)
     {
       gtk_widget_destroy (item->plus_pix_widget);
-      gtk_widget_unref (item->plus_pix_widget);
+      g_object_unref (item->plus_pix_widget);
       item->plus_pix_widget = NULL;
     }
   
@@ -879,7 +878,7 @@
   if (item->minus_pix_widget)
     {
       gtk_widget_destroy (item->minus_pix_widget);
-      gtk_widget_unref (item->minus_pix_widget);
+      g_object_unref (item->minus_pix_widget);
       item->minus_pix_widget = NULL;
     }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]