Commit b381678a authored by Johan Dahlin's avatar Johan Dahlin Committed by Johan Dahlin

Move GtkTranslateFunc to gtktypeutils.h so we can completely deprecate

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


svn path=/trunk/; revision=19721
parent b4fbde69
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
2008-03-06 Johan Dahlin <johan@gnome.org>
* gtk/gtkpreview.h: Avoid double-deprecation.
......
......@@ -27,6 +27,14 @@ Installation
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
======================
......
......@@ -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
......
......@@ -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
......
......@@ -29,7 +29,7 @@
#include <gdk/gdk.h>
#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
G_BEGIN_DECLS
......
......@@ -122,6 +122,13 @@ typedef void (*GtkCallbackMarshal) (GtkObject *object,
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment