gtk+ r19721 - in trunk: . gtk

[johan svn gnome org]

Author: johan
Date: Thu Mar  6 14:04:30 2008
New Revision: 19721
URL: http://svn.gnome.org/viewvc/gtk+?rev=19721&view=rev

Log:
2008-03-06  Johan Dahlin  <jdahlin async com br>

    * gtk/gtkitemfactory.h:
    * gtk/gtktypeutils.h:
    Move GtkTranslateFunc to gtktypeutils.h so we can completely
    deprecate gtkitemfactory.h. 

    * gtk/gtkactiongroup.h:
    * gtk/gtkstock.h:
    Do not include gtkitemfactory.h directly, instead include gtktypeutils.h

    * README.in: 
    Add a note describing this slight incompatible change



Modified:
   trunk/ChangeLog
   trunk/README.in
   trunk/gtk/gtkactiongroup.h
   trunk/gtk/gtkitemfactory.h
   trunk/gtk/gtkstock.h
   trunk/gtk/gtktypeutils.h

Modified: trunk/README.in
==============================================================================
--- trunk/README.in	(original)
+++ trunk/README.in	Thu Mar  6 14:04:30 2008
@@ -27,6 +27,14 @@
 See the file 'INSTALL'
 
 
+Release notes for 2.14
+======================
+
+* gtkitemfactory.h is now completely deprecated.
+  gtkactiongroup.h and gtkstock.h is no longer included it's header,
+  this might break application using gtk_item_factory_* symbols without
+  including gtkitemfactory.h which has never been supported.
+
 Release notes for 2.12
 ======================
 

Modified: trunk/gtk/gtkactiongroup.h
==============================================================================
--- trunk/gtk/gtkactiongroup.h	(original)
+++ trunk/gtk/gtkactiongroup.h	Thu Mar  6 14:04:30 2008
@@ -31,7 +31,7 @@
 #define __GTK_ACTION_GROUP_H__
 
 #include <gtk/gtkaction.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
+#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 

Modified: trunk/gtk/gtkitemfactory.h
==============================================================================
--- trunk/gtk/gtkitemfactory.h	(original)
+++ trunk/gtk/gtkitemfactory.h	Thu Mar  6 14:04:30 2008
@@ -27,6 +27,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_ITEM_FACTORY_H__
 #define	__GTK_ITEM_FACTORY_H__
 
@@ -35,11 +37,6 @@
 
 G_BEGIN_DECLS
 
-typedef gchar * (*GtkTranslateFunc)	   (const gchar		*path,
-					    gpointer             func_data);
-
-#if !defined (GTK_DISABLE_DEPRECATED)
-
 typedef void	(*GtkPrintFunc)		   (gpointer		 func_data,
 					    const gchar		*str);
 /* We use () here to mean unspecified arguments. This is deprecated

Modified: trunk/gtk/gtkstock.h
==============================================================================
--- trunk/gtk/gtkstock.h	(original)
+++ trunk/gtk/gtkstock.h	Thu Mar  6 14:04:30 2008
@@ -29,7 +29,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
+#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 

Modified: trunk/gtk/gtktypeutils.h
==============================================================================
--- trunk/gtk/gtktypeutils.h	(original)
+++ trunk/gtk/gtktypeutils.h	Thu Mar  6 14:04:30 2008
@@ -122,6 +122,13 @@
 				     guint         n_args,
 				     GtkArg       *args);
 typedef void (*GtkSignalFunc)       (void);
+
+/* This used to be defined in gtkitemfactory.h, but moved over here after
+ * the complete deprecation of that header
+ */
+typedef gchar * (*GtkTranslateFunc) (const gchar  *path,
+				     gpointer      func_data);
+
 #define GTK_SIGNAL_FUNC(f)	    ((GtkSignalFunc) (f))
 
 #ifndef GTK_DISABLE_DEPRECATED