Commit feece3c0 authored by Matthias Clasen's avatar Matthias Clasen

Move gtkstyle and gtkrc to deprecated/

This required a somewhat more substantial include reshuffling.
Some typedefs have been moved to gtkiconfactory.h and to
gtksettings.h.
parent 068e1f03
......@@ -151,6 +151,8 @@ deprecated_h_sources = \
deprecated/gtkhscale.h \
deprecated/gtkhscrollbar.h \
deprecated/gtkhseparator.h \
deprecated/gtkstyle.h \
deprecated/gtkrc.h \
deprecated/gtktable.h \
deprecated/gtktearoffmenuitem.h \
deprecated/gtkvbbox.h \
......@@ -286,7 +288,6 @@ gtk_public_h_sources = \
gtkradiomenuitem.h \
gtkradiotoolbutton.h \
gtkrange.h \
gtkrc.h \
gtkrecentaction.h \
gtkrecentchooser.h \
gtkrecentchooserdialog.h \
......@@ -316,7 +317,6 @@ gtk_public_h_sources = \
gtkstylecontext.h \
gtkstyleproperties.h \
gtkstyleprovider.h \
gtkstyle.h \
gtkswitch.h \
gtksymboliccolor.h \
gtktestutils.h \
......@@ -478,6 +478,8 @@ deprecated_c_sources = \
deprecated/gtkhscale.c \
deprecated/gtkhscrollbar.c \
deprecated/gtkhseparator.c \
deprecated/gtkrc.c \
deprecated/gtkstyle.c \
deprecated/gtktable.c \
deprecated/gtktearoffmenuitem.c \
deprecated/gtkvbbox.c \
......@@ -638,7 +640,6 @@ gtk_base_c_sources = \
gtkradiotoolbutton.c \
gtkrange.c \
gtkrbtree.c \
gtkrc.c \
gtkrecentaction.c \
gtkrecentchooserdefault.c \
gtkrecentchooserdialog.c \
......@@ -672,7 +673,6 @@ gtk_base_c_sources = \
gtkstyleproperties.c \
gtkstyleproperty.c \
gtkstyleprovider.c \
gtkstyle.c \
gtkswitch.c \
gtksymboliccolor.c \
gtktestutils.c \
......
......@@ -109,8 +109,6 @@ libgail_la_CPPFLAGS = \
-I$(top_builddir)/gtk \
-DGTK_VERSION=\"$(GTK_VERSION)\"\
-DGTK_COMPILATION \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(AM_CPPFLAGS)
libgail_la_CFLAGS = \
......
......@@ -24,6 +24,14 @@
#include <gdk/gdk.h>
#include <gtk/gtkx.h>
#include <gtk/gtkentry.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenubar.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkcombobox.h>
#include <gtk/gtkaccessible.h>
#include "gailutil.h"
#include "gailmisc.h"
......
......@@ -23,6 +23,12 @@
#include <string.h>
#include <gtk/gtkx.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkbutton.h>
#include "gtktoplevelaccessible.h"
......
......@@ -46,6 +46,7 @@
#include "gtkversion.h"
#include "gtkrc.h"
#include "gtkstyle.h"
#include "gtkbindings.h"
#include "gtkintl.h"
#include "gtkiconfactory.h"
......
......@@ -31,15 +31,12 @@
#ifndef __GTK_RC_H__
#define __GTK_RC_H__
#include <gtk/gtkstyle.h>
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
/* Forward declarations */
typedef struct _GtkIconFactory GtkIconFactory;
typedef struct _GtkRcContext GtkRcContext;
typedef struct _GtkRcStyleClass GtkRcStyleClass;
#define GTK_TYPE_RC_STYLE (gtk_rc_style_get_type ())
......@@ -148,7 +145,6 @@ gboolean _gtk_rc_match_widget_class (GSList *list,
gchar *path,
gchar *path_reversed);
#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
GDK_DEPRECATED_FOR(GtkStyleContext)
void gtk_rc_add_default_file (const gchar *filename);
GDK_DEPRECATED_FOR(GtkStyleContext)
......@@ -309,8 +305,6 @@ GDK_DEPRECATED_FOR(GtkStyleContext)
guint gtk_rc_parse_priority (GScanner *scanner,
GtkPathPriorityType *priority);
#endif
/* rc properties
* (structure forward declared in gtkstyle.h)
*/
......
......@@ -49,17 +49,9 @@ G_BEGIN_DECLS
/* Some forward declarations needed to rationalize the header
* files.
*/
typedef struct _GtkStyle GtkStyle;
typedef struct _GtkStyleClass GtkStyleClass;
typedef struct _GtkThemeEngine GtkThemeEngine;
typedef struct _GtkRcStyle GtkRcStyle;
typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkRcProperty GtkRcProperty;
typedef struct _GtkSettings GtkSettings;
typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
const GString *rc_string,
GValue *property_value);
/**
* GTK_STYLE_ATTACHED:
......@@ -376,8 +368,6 @@ struct _GtkStyleClass
void (*_gtk_reserved11) (void);
};
#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
GType gtk_style_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkStyleContext)
GtkStyle* gtk_style_new (void);
......@@ -659,7 +649,6 @@ void gtk_style_get (GtkStyle *style,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
#endif
/* --- private API --- */
GtkStyle* _gtk_style_new_for_path (GdkScreen *screen,
......
......@@ -151,7 +151,6 @@
#include <gtk/gtkradiomenuitem.h>
#include <gtk/gtkradiotoolbutton.h>
#include <gtk/gtkrange.h>
#include <gtk/gtkrc.h>
#include <gtk/gtkrecentaction.h>
#include <gtk/gtkrecentchooser.h>
#include <gtk/gtkrecentchooserdialog.h>
......@@ -180,7 +179,6 @@
#include <gtk/gtkstylecontext.h>
#include <gtk/gtkstyleproperties.h>
#include <gtk/gtkstyleprovider.h>
#include <gtk/gtkstyle.h>
#include <gtk/gtkswitch.h>
#include <gtk/gtksymboliccolor.h>
#include <gtk/gtktextattributes.h>
......@@ -231,6 +229,8 @@
#include <gtk/deprecated/gtkhscale.h>
#include <gtk/deprecated/gtkhscrollbar.h>
#include <gtk/deprecated/gtkhseparator.h>
#include <gtk/deprecated/gtkrc.h>
#include <gtk/deprecated/gtkstyle.h>
#include <gtk/deprecated/gtktable.h>
#include <gtk/deprecated/gtktearoffmenuitem.h>
#include <gtk/deprecated/gtkvbbox.h>
......
......@@ -22,10 +22,11 @@
#include "config.h"
#include "gtkcellrendererspin.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkspinbutton.h"
#include "gtkcellrendererspin.h"
/**
......
......@@ -41,6 +41,7 @@
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
#include "deprecated/gtkstyle.h"
/**
......
......@@ -32,7 +32,9 @@
#define __GTK_ICON_FACTORY_H__
#include <gdk/gdk.h>
#include <gtk/gtkrc.h>
#include <gtk/gtksettings.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkwidgetpath.h>
G_BEGIN_DECLS
......@@ -46,9 +48,16 @@ G_BEGIN_DECLS
#define GTK_TYPE_ICON_SET (gtk_icon_set_get_type ())
#define GTK_TYPE_ICON_SOURCE (gtk_icon_source_get_type ())
typedef struct _GtkIconFactory GtkIconFactory;
typedef struct _GtkIconFactoryPrivate GtkIconFactoryPrivate;
typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkStyle GtkStyle;
typedef struct _GtkRcStyle GtkRcStyle;
struct _GtkIconFactory
{
GObject parent_instance;
......
......@@ -48,6 +48,7 @@
#include "gtknumerableiconprivate.h"
#include "gtksettings.h"
#include "gtkprivate.h"
#include "deprecated/gtkstyle.h"
/**
......
......@@ -26,7 +26,6 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
#include <gtk/gtkstyle.h>
#include <gtk/gtkstylecontext.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <string.h>
#include "gtkmodules.h"
#include "gtkmodulesprivate.h"
#include "gtksettings.h"
#include "gtkdebug.h"
#include "gtkprivate.h"
......
......@@ -25,8 +25,7 @@
#ifndef __GTK_MODULES_H__
#define __GTK_MODULES_H__
#include <gtk/gtksettings.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
......
......@@ -29,6 +29,8 @@
G_BEGIN_DECLS
#include "gtksettings.h"
gchar * _gtk_find_module (const gchar *name,
const gchar *type);
gchar ** _gtk_get_module_path (const gchar *type);
......
......@@ -30,13 +30,14 @@
#ifndef __GTK_PLUG_H__
#define __GTK_PLUG_H__
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#include <gtk/gtksocket.h>
#include <gtk/gtkwindow.h>
G_BEGIN_DECLS
......
......@@ -27,9 +27,8 @@
#ifndef __GTK_PRIVATE_H__
#define __GTK_PRIVATE_H__
#include <glib.h>
#include "gtksettings.h"
#include <glib-object.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
......
......@@ -23,6 +23,8 @@
#include <string.h>
#include "gtksettings.h"
#include "gtkmodules.h"
#include "gtkmodulesprivate.h"
#include "gtksettingsprivate.h"
......@@ -43,6 +45,8 @@
#include "quartz/gdkquartz.h"
#endif
#include "deprecated/gtkrc.h"
/**
* SECTION:gtksettings
......
......@@ -23,7 +23,7 @@
#ifndef __GTK_SETTINGS_H__
#define __GTK_SETTINGS_H__
#include <gtk/gtkrc.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
......@@ -38,11 +38,17 @@ G_BEGIN_DECLS
/* --- typedefs --- */
typedef struct _GtkSettings GtkSettings;
typedef struct _GtkSettingsPrivate GtkSettingsPrivate;
typedef struct _GtkSettingsClass GtkSettingsClass;
typedef struct _GtkSettingsValue GtkSettingsValue;
typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
const GString *rc_string,
GValue *property_value);
/* --- structures --- */
struct _GtkSettings
{
......
......@@ -38,6 +38,7 @@
#include "gtkdnd.h"
#include "gtkdebug.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkwidgetprivate.h"
#include <gdk/gdkx.h>
......
......@@ -30,7 +30,8 @@
#ifndef __GTK_SOCKET_H__
#define __GTK_SOCKET_H__
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gtk/gtkwindow.h>
#ifdef GDK_WINDOWING_X11
......
......@@ -25,10 +25,10 @@
#define __GTK_STYLE_PROVIDER_H__
#include <glib-object.h>
#include "gtkwidgetpath.h"
#include "gtkiconfactory.h"
#include "gtkstyleproperties.h"
#include "gtkenums.h"
#include <gtk/gtkwidgetpath.h>
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkstyleproperties.h>
#include <gtk/gtkenums.h>
G_BEGIN_DECLS
......
......@@ -23,6 +23,12 @@
#include <gtk/gtkx.h>
#include "gtkspinbutton.h"
#include "gtkmain.h"
#include "gtkbox.h"
#include "gtklabel.h"
#include "gtkbutton.h"
#include "gtktextview.h"
#include "gtkrange.h"
#include <locale.h>
#include <string.h>
......
......@@ -34,7 +34,6 @@
#include <gdk/gdk.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkstyle.h>
#include <gtk/gtkborder.h>
#include <gtk/gtksettings.h>
#include <gtk/gtkstylecontext.h>
......@@ -74,7 +73,6 @@ typedef struct _GtkClipboard GtkClipboard;
typedef struct _GtkTooltip GtkTooltip;
typedef struct _GtkWindow GtkWindow;
/**
* GtkAllocation:
* @x: the X position of the widget's area relative to its parents allocation.
......@@ -792,7 +790,7 @@ void gtk_widget_override_cursor (GtkWidget *widget,
void gtk_widget_reset_style (GtkWidget *widget);
#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
#ifndef GTK_DISABLE_DEPRECATED
void gtk_widget_style_attach (GtkWidget *widget);
......
......@@ -6,8 +6,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DSRCDIR=\""$(abs_srcdir)"\" \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
......
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