Move wholly deprecated classes to gtk/deprecated/

We've recently a number of classes wholly. For these cases,
move the headers and sources to gtk/deprecated/ and adjust
Makefiles and includes accordingly.

Affected classes:
GtkAction
GtkActionGroup
GtkActivatable
GtkIconFactory
GtkImageMenuItem
GtkRadioAction
GtkRecentAction
GtkStock
GtkToggleAction
GtkUIManager
This commit is contained in:
Matthias Clasen 2013-07-19 20:29:11 -04:00
parent d7b6827856
commit 0aa57d26b5
70 changed files with 109 additions and 1239 deletions

View File

@ -136,6 +136,9 @@ endif
# by configure) # by configure)
deprecated_h_sources = \ deprecated_h_sources = \
deprecated/gtkactivatable.h \
deprecated/gtkaction.h \
deprecated/gtkactiongroup.h \
deprecated/gtkcolorsel.h \ deprecated/gtkcolorsel.h \
deprecated/gtkcolorseldialog.h \ deprecated/gtkcolorseldialog.h \
deprecated/gtkfontsel.h \ deprecated/gtkfontsel.h \
@ -148,11 +151,18 @@ deprecated_h_sources = \
deprecated/gtkhscrollbar.h \ deprecated/gtkhscrollbar.h \
deprecated/gtkhseparator.h \ deprecated/gtkhseparator.h \
deprecated/gtkhsv.h \ deprecated/gtkhsv.h \
deprecated/gtkiconfactory.h \
deprecated/gtkimagemenuitem.h \
deprecated/gtkradioaction.h \
deprecated/gtkrc.h \ deprecated/gtkrc.h \
deprecated/gtkrecentaction.h \
deprecated/gtkstock.h \
deprecated/gtkstyle.h \ deprecated/gtkstyle.h \
deprecated/gtksymboliccolor.h \ deprecated/gtksymboliccolor.h \
deprecated/gtktable.h \ deprecated/gtktable.h \
deprecated/gtktearoffmenuitem.h \ deprecated/gtktearoffmenuitem.h \
deprecated/gtktoggleaction.h \
deprecated/gtkuimanager.h \
deprecated/gtkvbbox.h \ deprecated/gtkvbbox.h \
deprecated/gtkvbox.h \ deprecated/gtkvbox.h \
deprecated/gtkvscale.h \ deprecated/gtkvscale.h \
@ -174,9 +184,6 @@ gtk_public_h_sources = \
gtkaccelmap.h \ gtkaccelmap.h \
gtkaccessible.h \ gtkaccessible.h \
gtkactionable.h \ gtkactionable.h \
gtkaction.h \
gtkactiongroup.h \
gtkactivatable.h \
gtkadjustment.h \ gtkadjustment.h \
gtkalignment.h \ gtkalignment.h \
gtkappchooser.h \ gtkappchooser.h \
@ -249,11 +256,9 @@ gtk_public_h_sources = \
gtkframe.h \ gtkframe.h \
gtkgrid.h \ gtkgrid.h \
gtkheaderbar.h \ gtkheaderbar.h \
gtkiconfactory.h \
gtkicontheme.h \ gtkicontheme.h \
gtkiconview.h \ gtkiconview.h \
gtkimage.h \ gtkimage.h \
gtkimagemenuitem.h \
gtkimcontext.h \ gtkimcontext.h \
gtkimcontextinfo.h \ gtkimcontextinfo.h \
gtkimcontextsimple.h \ gtkimcontextsimple.h \
@ -294,12 +299,10 @@ gtk_public_h_sources = \
gtkprintoperationpreview.h \ gtkprintoperationpreview.h \
gtkprintsettings.h \ gtkprintsettings.h \
gtkprogressbar.h \ gtkprogressbar.h \
gtkradioaction.h \
gtkradiobutton.h \ gtkradiobutton.h \
gtkradiomenuitem.h \ gtkradiomenuitem.h \
gtkradiotoolbutton.h \ gtkradiotoolbutton.h \
gtkrange.h \ gtkrange.h \
gtkrecentaction.h \
gtkrecentchooser.h \ gtkrecentchooser.h \
gtkrecentchooserdialog.h \ gtkrecentchooserdialog.h \
gtkrecentchoosermenu.h \ gtkrecentchoosermenu.h \
@ -329,7 +332,6 @@ gtk_public_h_sources = \
gtkstackswitcher.h \ gtkstackswitcher.h \
gtkstatusbar.h \ gtkstatusbar.h \
gtkstatusicon.h \ gtkstatusicon.h \
gtkstock.h \
gtkstylecontext.h \ gtkstylecontext.h \
gtkstyleproperties.h \ gtkstyleproperties.h \
gtkstyleprovider.h \ gtkstyleprovider.h \
@ -346,7 +348,6 @@ gtk_public_h_sources = \
gtktexttagtable.h \ gtktexttagtable.h \
gtktextview.h \ gtktextview.h \
gtkthemingengine.h \ gtkthemingengine.h \
gtktoggleaction.h \
gtktogglebutton.h \ gtktogglebutton.h \
gtktoggletoolbutton.h \ gtktoggletoolbutton.h \
gtktoolbar.h \ gtktoolbar.h \
@ -366,7 +367,6 @@ gtk_public_h_sources = \
gtktreeview.h \ gtktreeview.h \
gtktreeviewcolumn.h \ gtktreeviewcolumn.h \
gtktypes.h \ gtktypes.h \
gtkuimanager.h \
gtkviewport.h \ gtkviewport.h \
gtkvolumebutton.h \ gtkvolumebutton.h \
gtkwidget.h \ gtkwidget.h \
@ -563,6 +563,9 @@ gtk_private_h_sources = \
# GTK+ C sources to build the library from # GTK+ C sources to build the library from
deprecated_c_sources = \ deprecated_c_sources = \
deprecated/gtkactivatable.c \
deprecated/gtkaction.c \
deprecated/gtkactiongroup.c \
deprecated/gtkcolorsel.c \ deprecated/gtkcolorsel.c \
deprecated/gtkcolorseldialog.c \ deprecated/gtkcolorseldialog.c \
deprecated/gtkfontsel.c \ deprecated/gtkfontsel.c \
@ -575,11 +578,18 @@ deprecated_c_sources = \
deprecated/gtkhscrollbar.c \ deprecated/gtkhscrollbar.c \
deprecated/gtkhseparator.c \ deprecated/gtkhseparator.c \
deprecated/gtkhsv.c \ deprecated/gtkhsv.c \
deprecated/gtkiconfactory.c \
deprecated/gtkimagemenuitem.c \
deprecated/gtkradioaction.c \
deprecated/gtkrc.c \ deprecated/gtkrc.c \
deprecated/gtkrecentaction.c \
deprecated/gtkstock.c \
deprecated/gtkstyle.c \ deprecated/gtkstyle.c \
deprecated/gtksymboliccolor.c \ deprecated/gtksymboliccolor.c \
deprecated/gtktable.c \ deprecated/gtktable.c \
deprecated/gtktearoffmenuitem.c \ deprecated/gtktearoffmenuitem.c \
deprecated/gtktoggleaction.c \
deprecated/gtkuimanager.c \
deprecated/gtkvbbox.c \ deprecated/gtkvbbox.c \
deprecated/gtkvbox.c \ deprecated/gtkvbox.c \
deprecated/gtkvscale.c \ deprecated/gtkvscale.c \
@ -604,10 +614,7 @@ gtk_base_c_sources = \
gtkaccellabel.c \ gtkaccellabel.c \
gtkaccelmap.c \ gtkaccelmap.c \
gtkaccessible.c \ gtkaccessible.c \
gtkaction.c \
gtkactionhelper.c \ gtkactionhelper.c \
gtkactiongroup.c \
gtkactivatable.c \
gtkadjustment.c \ gtkadjustment.c \
gtkalignment.c \ gtkalignment.c \
gtkallocatedbitmask.c \ gtkallocatedbitmask.c \
@ -744,12 +751,10 @@ gtk_base_c_sources = \
gtkhsla.c \ gtkhsla.c \
gtkiconcache.c \ gtkiconcache.c \
gtkiconcachevalidator.c \ gtkiconcachevalidator.c \
gtkiconfactory.c \
gtkiconhelper.c \ gtkiconhelper.c \
gtkicontheme.c \ gtkicontheme.c \
gtkiconview.c \ gtkiconview.c \
gtkimage.c \ gtkimage.c \
gtkimagemenuitem.c \
gtkimcontext.c \ gtkimcontext.c \
gtkimcontextsimple.c \ gtkimcontextsimple.c \
gtkimmodule.c \ gtkimmodule.c \
@ -802,13 +807,11 @@ gtk_base_c_sources = \
gtkprivatetypebuiltins.c \ gtkprivatetypebuiltins.c \
gtkprogressbar.c \ gtkprogressbar.c \
gtkpixelcache.c \ gtkpixelcache.c \
gtkradioaction.c \
gtkradiobutton.c \ gtkradiobutton.c \
gtkradiomenuitem.c \ gtkradiomenuitem.c \
gtkradiotoolbutton.c \ gtkradiotoolbutton.c \
gtkrange.c \ gtkrange.c \
gtkrbtree.c \ gtkrbtree.c \
gtkrecentaction.c \
gtkrecentchooserdefault.c \ gtkrecentchooserdefault.c \
gtkrecentchooserdialog.c \ gtkrecentchooserdialog.c \
gtkrecentchoosermenu.c \ gtkrecentchoosermenu.c \
@ -840,7 +843,6 @@ gtk_base_c_sources = \
gtkstackswitcher.c \ gtkstackswitcher.c \
gtkstatusbar.c \ gtkstatusbar.c \
gtkstatusicon.c \ gtkstatusicon.c \
gtkstock.c \
gtkstyleanimation.c \ gtkstyleanimation.c \
gtkstylecascade.c \ gtkstylecascade.c \
gtkstylecontext.c \ gtkstylecontext.c \
@ -869,7 +871,6 @@ gtk_base_c_sources = \
gtktextview.c \ gtktextview.c \
gtkthemingbackground.c \ gtkthemingbackground.c \
gtkthemingengine.c \ gtkthemingengine.c \
gtktoggleaction.c \
gtktogglebutton.c \ gtktogglebutton.c \
gtktoggletoolbutton.c \ gtktoggletoolbutton.c \
gtktoolbar.c \ gtktoolbar.c \
@ -892,7 +893,6 @@ gtk_base_c_sources = \
gtktreeview.c \ gtktreeview.c \
gtktreeviewcolumn.c \ gtktreeviewcolumn.c \
gtktypebuiltins.c \ gtktypebuiltins.c \
gtkuimanager.c \
gtkvolumebutton.c \ gtkvolumebutton.c \
gtkviewport.c \ gtkviewport.c \
gtkwidget.c \ gtkwidget.c \

View File

@ -33,8 +33,8 @@
#error "Only <gtk/gtk.h> can be included directly." #error "Only <gtk/gtk.h> can be included directly."
#endif #endif
#include <gtk/gtkaction.h> #include <gtk/deprecated/gtkaction.h>
#include <gtk/gtkstock.h> #include <gtk/deprecated/gtkstock.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -22,7 +22,7 @@
#error "Only <gtk/gtk.h> can be included directly." #error "Only <gtk/gtk.h> can be included directly."
#endif #endif
#include <gtk/gtkaction.h> #include <gtk/deprecated/gtkaction.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -35,7 +35,7 @@
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtksettingsprivate.h" #include "gtksettingsprivate.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"

View File

@ -33,7 +33,7 @@
#error "Only <gtk/gtk.h> can be included directly." #error "Only <gtk/gtk.h> can be included directly."
#endif #endif
#include <gtk/gtktoggleaction.h> #include <gtk/deprecated/gtktoggleaction.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -24,7 +24,7 @@
#error "Only <gtk/gtk.h> can be included directly." #error "Only <gtk/gtk.h> can be included directly."
#endif #endif
#include <gtk/gtkaction.h> #include <gtk/deprecated/gtkaction.h>
#include <gtk/gtkrecentmanager.h> #include <gtk/gtkrecentmanager.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -33,7 +33,7 @@
#error "Only <gtk/gtk.h> can be included directly." #error "Only <gtk/gtk.h> can be included directly."
#endif #endif
#include <gtk/gtkaction.h> #include <gtk/deprecated/gtkaction.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -35,8 +35,8 @@
#include <gtk/gtkaccelgroup.h> #include <gtk/gtkaccelgroup.h>
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#include <gtk/gtkaction.h> #include <gtk/deprecated/gtkaction.h>
#include <gtk/gtkactiongroup.h> #include <gtk/deprecated/gtkactiongroup.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -33,10 +33,7 @@
#include <gtk/gtkaccellabel.h> #include <gtk/gtkaccellabel.h>
#include <gtk/gtkaccelmap.h> #include <gtk/gtkaccelmap.h>
#include <gtk/gtkaccessible.h> #include <gtk/gtkaccessible.h>
#include <gtk/gtkaction.h>
#include <gtk/gtkactionable.h> #include <gtk/gtkactionable.h>
#include <gtk/gtkactiongroup.h>
#include <gtk/gtkactivatable.h>
#include <gtk/gtkadjustment.h> #include <gtk/gtkadjustment.h>
#include <gtk/gtkalignment.h> #include <gtk/gtkalignment.h>
#include <gtk/gtkappchooser.h> #include <gtk/gtkappchooser.h>
@ -109,11 +106,9 @@
#include <gtk/gtkframe.h> #include <gtk/gtkframe.h>
#include <gtk/gtkgrid.h> #include <gtk/gtkgrid.h>
#include <gtk/gtkheaderbar.h> #include <gtk/gtkheaderbar.h>
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkicontheme.h> #include <gtk/gtkicontheme.h>
#include <gtk/gtkiconview.h> #include <gtk/gtkiconview.h>
#include <gtk/gtkimage.h> #include <gtk/gtkimage.h>
#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtkimcontext.h> #include <gtk/gtkimcontext.h>
#include <gtk/gtkimcontextinfo.h> #include <gtk/gtkimcontextinfo.h>
#include <gtk/gtkimcontextsimple.h> #include <gtk/gtkimcontextsimple.h>
@ -152,12 +147,10 @@
#include <gtk/gtkprintoperationpreview.h> #include <gtk/gtkprintoperationpreview.h>
#include <gtk/gtkprintsettings.h> #include <gtk/gtkprintsettings.h>
#include <gtk/gtkprogressbar.h> #include <gtk/gtkprogressbar.h>
#include <gtk/gtkradioaction.h>
#include <gtk/gtkradiobutton.h> #include <gtk/gtkradiobutton.h>
#include <gtk/gtkradiomenuitem.h> #include <gtk/gtkradiomenuitem.h>
#include <gtk/gtkradiotoolbutton.h> #include <gtk/gtkradiotoolbutton.h>
#include <gtk/gtkrange.h> #include <gtk/gtkrange.h>
#include <gtk/gtkrecentaction.h>
#include <gtk/gtkrecentchooser.h> #include <gtk/gtkrecentchooser.h>
#include <gtk/gtkrecentchooserdialog.h> #include <gtk/gtkrecentchooserdialog.h>
#include <gtk/gtkrecentchoosermenu.h> #include <gtk/gtkrecentchoosermenu.h>
@ -186,7 +179,6 @@
#include <gtk/gtkstackswitcher.h> #include <gtk/gtkstackswitcher.h>
#include <gtk/gtkstatusbar.h> #include <gtk/gtkstatusbar.h>
#include <gtk/gtkstatusicon.h> #include <gtk/gtkstatusicon.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkstylecontext.h> #include <gtk/gtkstylecontext.h>
#include <gtk/gtkstyleproperties.h> #include <gtk/gtkstyleproperties.h>
#include <gtk/gtkstyleprovider.h> #include <gtk/gtkstyleprovider.h>
@ -201,7 +193,6 @@
#include <gtk/gtktexttagtable.h> #include <gtk/gtktexttagtable.h>
#include <gtk/gtktextview.h> #include <gtk/gtktextview.h>
#include <gtk/gtkthemingengine.h> #include <gtk/gtkthemingengine.h>
#include <gtk/gtktoggleaction.h>
#include <gtk/gtktogglebutton.h> #include <gtk/gtktogglebutton.h>
#include <gtk/gtktoggletoolbutton.h> #include <gtk/gtktoggletoolbutton.h>
#include <gtk/gtktoolbar.h> #include <gtk/gtktoolbar.h>
@ -223,7 +214,6 @@
#include <gtk/gtktreeviewcolumn.h> #include <gtk/gtktreeviewcolumn.h>
#include <gtk/gtktypebuiltins.h> #include <gtk/gtktypebuiltins.h>
#include <gtk/gtktypes.h> #include <gtk/gtktypes.h>
#include <gtk/gtkuimanager.h>
#include <gtk/gtkversion.h> #include <gtk/gtkversion.h>
#include <gtk/gtkviewport.h> #include <gtk/gtkviewport.h>
#include <gtk/gtkvolumebutton.h> #include <gtk/gtkvolumebutton.h>
@ -232,6 +222,9 @@
#include <gtk/gtkwindow.h> #include <gtk/gtkwindow.h>
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
#include <gtk/deprecated/gtkactivatable.h>
#include <gtk/deprecated/gtkaction.h>
#include <gtk/deprecated/gtkactiongroup.h>
#include <gtk/deprecated/gtkcolorsel.h> #include <gtk/deprecated/gtkcolorsel.h>
#include <gtk/deprecated/gtkcolorseldialog.h> #include <gtk/deprecated/gtkcolorseldialog.h>
#include <gtk/deprecated/gtkfontsel.h> #include <gtk/deprecated/gtkfontsel.h>
@ -244,11 +237,18 @@
#include <gtk/deprecated/gtkhscale.h> #include <gtk/deprecated/gtkhscale.h>
#include <gtk/deprecated/gtkhscrollbar.h> #include <gtk/deprecated/gtkhscrollbar.h>
#include <gtk/deprecated/gtkhseparator.h> #include <gtk/deprecated/gtkhseparator.h>
#include <gtk/deprecated/gtkiconfactory.h>
#include <gtk/deprecated/gtkimagemenuitem.h>
#include <gtk/deprecated/gtkradioaction.h>
#include <gtk/deprecated/gtkrc.h> #include <gtk/deprecated/gtkrc.h>
#include <gtk/deprecated/gtkrecentaction.h>
#include <gtk/deprecated/gtkstock.h>
#include <gtk/deprecated/gtkstyle.h> #include <gtk/deprecated/gtkstyle.h>
#include <gtk/deprecated/gtksymboliccolor.h> #include <gtk/deprecated/gtksymboliccolor.h>
#include <gtk/deprecated/gtktable.h> #include <gtk/deprecated/gtktable.h>
#include <gtk/deprecated/gtktearoffmenuitem.h> #include <gtk/deprecated/gtktearoffmenuitem.h>
#include <gtk/deprecated/gtktoggleaction.h>
#include <gtk/deprecated/gtkuimanager.h>
#include <gtk/deprecated/gtkvbbox.h> #include <gtk/deprecated/gtkvbbox.h>
#include <gtk/deprecated/gtkvbox.h> #include <gtk/deprecated/gtkvbox.h>
#include <gtk/deprecated/gtkvpaned.h> #include <gtk/deprecated/gtkvpaned.h>

View File

@ -44,7 +44,7 @@
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtktextview.h" #include "gtktextview.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkshow.h" #include "gtkshow.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"

View File

@ -52,7 +52,7 @@
#include "gtkbbox.h" #include "gtkbbox.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkmenuitem.h" #include "gtkmenuitem.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include <string.h> #include <string.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>

View File

@ -254,7 +254,7 @@
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
static void gtk_builder_class_init (GtkBuilderClass *klass); static void gtk_builder_class_init (GtkBuilderClass *klass);

View File

@ -48,9 +48,9 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"

View File

@ -20,7 +20,7 @@
#define __GTK_BUTTON_PRIVATE_H__ #define __GTK_BUTTON_PRIVATE_H__
#include "gtkactionhelper.h" #include "gtkactionhelper.h"
#include "gtkaction.h" #include "deprecated/gtkaction.h"
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <cairo-gobject.h> #include <cairo-gobject.h>
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkintl.h" #include "gtkintl.h"

View File

@ -28,7 +28,7 @@
#include "config.h" #include "config.h"
#include "gtkcellrendererspinner.h" #include "gtkcellrendererspinner.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtksettings.h" #include "gtksettings.h"

View File

@ -26,8 +26,8 @@
#include "gtkcheckmenuitem.h" #include "gtkcheckmenuitem.h"
#include "gtkmenuitemprivate.h" #include "gtkmenuitemprivate.h"
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtktoggleaction.h" #include "deprecated/gtktoggleaction.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"

View File

@ -40,7 +40,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
/** /**
* SECTION:gtkdialog * SECTION:gtkdialog

View File

@ -30,7 +30,7 @@
#include "gdk/gdk.h" #include "gdk/gdk.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkimageprivate.h" #include "gtkimageprivate.h"
#include "gtkinvisible.h" #include "gtkinvisible.h"

View File

@ -40,13 +40,13 @@
#endif #endif
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkinvisible.h" #include "gtkinvisible.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkplug.h" #include "gtkplug.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h" #include "gtkintl.h"

View File

@ -38,7 +38,7 @@
#include "gtkentry.h" #include "gtkentry.h"
#include "gtkentrybuffer.h" #include "gtkentrybuffer.h"
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkimcontextsimple.h" #include "gtkimcontextsimple.h"
#include "gtkimmulticontext.h" #include "gtkimmulticontext.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -51,7 +51,7 @@
#include "gtkselection.h" #include "gtkselection.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkspinbutton.h" #include "gtkspinbutton.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtktextutil.h" #include "gtktextutil.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktreeview.h" #include "gtktreeview.h"
@ -61,7 +61,7 @@
#include "gtkentryprivate.h" #include "gtkentryprivate.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"

View File

@ -36,11 +36,11 @@
#include "gtkcombobox.h" #include "gtkcombobox.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkliststore.h" #include "gtkliststore.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtktreemodelfilter.h" #include "gtktreemodelfilter.h"
#include "gtkseparator.h" #include "gtkseparator.h"
#include "gtkfilechooserdialog.h" #include "gtkfilechooserdialog.h"

View File

@ -45,10 +45,10 @@
#include "gtkfilesystemmodel.h" #include "gtkfilesystemmodel.h"
#include "gtkframe.h" #include "gtkframe.h"
#include "gtkgrid.h" #include "gtkgrid.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkinfobar.h" #include "gtkinfobar.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"

View File

@ -28,7 +28,7 @@
#include "gtkfontchooserwidget.h" #include "gtkfontchooserwidget.h"
#include "gtkfontchooserutils.h" #include "gtkfontchooserutils.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"

View File

@ -39,7 +39,7 @@
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkiconcache.h" #include "gtkiconcache.h"
#include "gtkbuiltincache.h" #include "gtkbuiltincache.h"
#include "gtkintl.h" #include "gtkintl.h"

View File

@ -31,8 +31,8 @@
#include "gtkcontainer.h" #include "gtkcontainer.h"
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
#include "gtkimageprivate.h" #include "gtkimageprivate.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkintl.h" #include "gtkintl.h"

File diff suppressed because it is too large Load Diff

View File

@ -45,7 +45,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
/** /**
* SECTION:gtkinfobar * SECTION:gtkinfobar

View File

@ -34,7 +34,7 @@
#include "gtkpango.h" #include "gtkpango.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkclipboard.h" #include "gtkclipboard.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtktextutil.h" #include "gtktextutil.h"

View File

@ -52,7 +52,7 @@
#include "gtkclipboard.h" #include "gtkclipboard.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"

View File

@ -37,7 +37,7 @@
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtksettings.h" #include "gtksettings.h"

View File

@ -19,7 +19,7 @@
#define __GTK_MENU_ITEM_PRIVATE_H__ #define __GTK_MENU_ITEM_PRIVATE_H__
#include <gtk/gtkmenuitem.h> #include <gtk/gtkmenuitem.h>
#include <gtk/gtkaction.h> #include <gtk/deprecated/gtkaction.h>
#include <gtk/gtkactionhelper.h> #include <gtk/gtkactionhelper.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -33,7 +33,7 @@
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"

View File

@ -46,7 +46,7 @@
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkmain.h" #include "gtkmain.h"
#include <glib/gprintf.h> #include <glib/gprintf.h>

View File

@ -25,7 +25,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkliststore.h" #include "gtkliststore.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtktreeviewcolumn.h" #include "gtktreeviewcolumn.h"
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtktreemodel.h" #include "gtktreemodel.h"

View File

@ -25,7 +25,7 @@
#include "gtkarrow.h" #include "gtkarrow.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkintl.h" #include "gtkintl.h"

View File

@ -56,7 +56,7 @@
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include "gtkfilechooserprivate.h" #include "gtkfilechooserprivate.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"

View File

@ -36,7 +36,7 @@
#include "gtkspinbutton.h" #include "gtkspinbutton.h"
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtknotebook.h" #include "gtknotebook.h"

View File

@ -26,7 +26,7 @@
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkradiomenuitem.h" #include "gtkradiomenuitem.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "a11y/gtkradiomenuitemaccessible.h" #include "a11y/gtkradiomenuitemaccessible.h"

View File

@ -22,8 +22,8 @@
#include "gtkrecentchooser.h" #include "gtkrecentchooser.h"
#include "gtkrecentchooserprivate.h" #include "gtkrecentchooserprivate.h"
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtkrecentaction.h" #include "deprecated/gtkrecentaction.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -28,7 +28,7 @@
#endif #endif
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtktreeview.h" #include "gtktreeview.h"
#include "gtkliststore.h" #include "gtkliststore.h"
@ -46,7 +46,7 @@
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkpaned.h" #include "gtkpaned.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmenuitem.h" #include "gtkmenuitem.h"
@ -62,7 +62,7 @@
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtkrecentfilter.h" #include "gtkrecentfilter.h"

View File

@ -27,20 +27,20 @@
#include "gtkrecentchooserprivate.h" #include "gtkrecentchooserprivate.h"
#include "gtkrecentchoosermenu.h" #include "gtkrecentchoosermenu.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkmenushell.h" #include "gtkmenushell.h"
#include "gtkmenuitem.h" #include "gtkmenuitem.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtkmenu.h" #include "gtkmenu.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -23,7 +23,7 @@
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtkrecentchooser.h" #include "gtkrecentchooser.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -103,7 +103,7 @@
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -34,7 +34,7 @@
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"

View File

@ -46,7 +46,7 @@
#include "gtkorientableprivate.h" #include "gtkorientableprivate.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkwidgetpath.h" #include "gtkwidgetpath.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"

View File

@ -33,7 +33,7 @@
#include "gtkstatusicon.h" #include "gtkstatusicon.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"

View File

@ -37,7 +37,7 @@
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkwidgetpath.h" #include "gtkwidgetpath.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkstylecascadeprivate.h" #include "gtkstylecascadeprivate.h"

View File

@ -24,7 +24,7 @@
#include <glib-object.h> #include <glib-object.h>
#include <gtk/gtkenums.h> #include <gtk/gtkenums.h>
#include <gtk/gtkiconfactory.h> #include <gtk/deprecated/gtkiconfactory.h>
#include <gtk/gtkstyleproperties.h> #include <gtk/gtkstyleproperties.h>
#include <gtk/gtktypes.h> #include <gtk/gtktypes.h>

View File

@ -38,10 +38,10 @@
#include "gtkswitch.h" #include "gtkswitch.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktoggleaction.h" #include "deprecated/gtktoggleaction.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkapplicationprivate.h" #include "gtkapplicationprivate.h"

View File

@ -30,7 +30,7 @@
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"

View File

@ -30,8 +30,8 @@
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktoggleaction.h" #include "deprecated/gtktoggleaction.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "a11y/gtktogglebuttonaccessible.h" #include "a11y/gtktogglebuttonaccessible.h"

View File

@ -22,11 +22,11 @@
#include "gtkcheckmenuitem.h" #include "gtkcheckmenuitem.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtktogglebutton.h" #include "gtktogglebutton.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkradiotoolbutton.h" #include "gtkradiotoolbutton.h"
#include "gtktoggleaction.h" #include "deprecated/gtktoggleaction.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -49,7 +49,7 @@
#include "gtkradiotoolbutton.h" #include "gtkradiotoolbutton.h"
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h" #include "gtkseparatortoolitem.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtktoolshell.h" #include "gtktoolshell.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -21,15 +21,15 @@
#include "config.h" #include "config.h"
#include "gtktoolbutton.h" #include "gtktoolbutton.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkimagemenuitem.h" #include "deprecated/gtkimagemenuitem.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkactionable.h" #include "gtkactionable.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -28,7 +28,7 @@
#include "gtktoolshell.h" #include "gtktoolshell.h"
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"

View File

@ -38,7 +38,7 @@
#include "gtkclipboard.h" #include "gtkclipboard.h"
#include "gtkcssstylepropertyprivate.h" #include "gtkcssstylepropertyprivate.h"
#include "gtkcssnumbervalueprivate.h" #include "gtkcssnumbervalueprivate.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkselectionprivate.h" #include "gtkselectionprivate.h"

View File

@ -40,7 +40,7 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmnemonichash.h" #include "gtkmnemonichash.h"
#include "gtkmenubar.h" #include "gtkmenubar.h"
#include "gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkplug.h" #include "gtkplug.h"