[gtk+] Move wholly deprecated classes to gtk/deprecated/
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Move wholly deprecated classes to gtk/deprecated/
- Date: Sat, 20 Jul 2013 01:51:22 +0000 (UTC)
commit 0aa57d26b53a39d0f95bc42d34abd70f4f32406b
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 19 20:29:11 2013 -0400
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
gtk/Makefile.am | 40 +-
gtk/{ => deprecated}/gtkaction.c | 0
gtk/{ => deprecated}/gtkaction.h | 0
gtk/{ => deprecated}/gtkactiongroup.c | 0
gtk/{ => deprecated}/gtkactiongroup.h | 4 +-
gtk/{ => deprecated}/gtkactivatable.c | 0
gtk/{ => deprecated}/gtkactivatable.h | 2 +-
gtk/{ => deprecated}/gtkiconfactory.c | 2 +-
gtk/{ => deprecated}/gtkiconfactory.h | 0
gtk/{ => deprecated}/gtkimagemenuitem.h | 0
gtk/{ => deprecated}/gtkradioaction.c | 0
gtk/{ => deprecated}/gtkradioaction.h | 2 +-
gtk/{ => deprecated}/gtkrecentaction.c | 0
gtk/{ => deprecated}/gtkrecentaction.h | 2 +-
gtk/{ => deprecated}/gtkstock.c | 0
gtk/{ => deprecated}/gtkstock.h | 0
gtk/{ => deprecated}/gtktoggleaction.c | 0
gtk/{ => deprecated}/gtktoggleaction.h | 2 +-
gtk/{ => deprecated}/gtkuimanager.c | 0
gtk/{ => deprecated}/gtkuimanager.h | 4 +-
gtk/gtk.h | 20 +-
gtk/gtkaboutdialog.c | 2 +-
gtk/gtkappchooserdialog.c | 2 +-
gtk/gtkbuilder.c | 2 +-
gtk/gtkbutton.c | 6 +-
gtk/gtkbuttonprivate.h | 2 +-
gtk/gtkcellrendererpixbuf.c | 2 +-
gtk/gtkcellrendererspinner.c | 2 +-
gtk/gtkcheckmenuitem.c | 4 +-
gtk/gtkdialog.c | 2 +-
gtk/gtkdnd-quartz.c | 2 +-
gtk/gtkdnd.c | 4 +-
gtk/gtkentry.c | 6 +-
gtk/gtkfilechooserbutton.c | 4 +-
gtk/gtkfilechooserdefault.c | 4 +-
gtk/gtkfontchooserdialog.c | 2 +-
gtk/gtkicontheme.c | 2 +-
gtk/gtkimage.c | 4 +-
gtk/gtkimagemenuitem.c | 1130 -------------------------------
gtk/gtkinfobar.c | 2 +-
gtk/gtklabel.c | 2 +-
gtk/gtklinkbutton.c | 2 +-
gtk/gtkmenuitem.c | 2 +-
gtk/gtkmenuitemprivate.h | 2 +-
gtk/gtkmessagedialog.c | 2 +-
gtk/gtkmountoperation.c | 2 +-
gtk/gtkpagesetupunixdialog.c | 2 +-
gtk/gtkpathbar.c | 2 +-
gtk/gtkplacessidebar.c | 2 +-
gtk/gtkprintunixdialog.c | 2 +-
gtk/gtkradiomenuitem.c | 2 +-
gtk/gtkrecentchooser.c | 4 +-
gtk/gtkrecentchooserdefault.c | 6 +-
gtk/gtkrecentchoosermenu.c | 8 +-
gtk/gtkrecentchooserprivate.h | 2 +-
gtk/gtkrecentmanager.c | 2 +-
gtk/gtkscale.c | 2 +-
gtk/gtkspinbutton.c | 2 +-
gtk/gtkstatusicon.c | 2 +-
gtk/gtkstylecontext.c | 2 +-
gtk/gtkstyleprovider.h | 2 +-
gtk/gtkswitch.c | 4 +-
gtk/gtktextview.c | 2 +-
gtk/gtktogglebutton.c | 4 +-
gtk/gtktoggletoolbutton.c | 6 +-
gtk/gtktoolbar.c | 2 +-
gtk/gtktoolbutton.c | 8 +-
gtk/gtktoolitem.c | 2 +-
gtk/gtkwidget.c | 2 +-
gtk/gtkwindow.c | 2 +-
70 files changed, 109 insertions(+), 1239 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 19fea2d..457f57b 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -136,6 +136,9 @@ endif
# by configure)
deprecated_h_sources = \
+ deprecated/gtkactivatable.h \
+ deprecated/gtkaction.h \
+ deprecated/gtkactiongroup.h \
deprecated/gtkcolorsel.h \
deprecated/gtkcolorseldialog.h \
deprecated/gtkfontsel.h \
@@ -148,11 +151,18 @@ deprecated_h_sources = \
deprecated/gtkhscrollbar.h \
deprecated/gtkhseparator.h \
deprecated/gtkhsv.h \
+ deprecated/gtkiconfactory.h \
+ deprecated/gtkimagemenuitem.h \
+ deprecated/gtkradioaction.h \
deprecated/gtkrc.h \
+ deprecated/gtkrecentaction.h \
+ deprecated/gtkstock.h \
deprecated/gtkstyle.h \
deprecated/gtksymboliccolor.h \
deprecated/gtktable.h \
deprecated/gtktearoffmenuitem.h \
+ deprecated/gtktoggleaction.h \
+ deprecated/gtkuimanager.h \
deprecated/gtkvbbox.h \
deprecated/gtkvbox.h \
deprecated/gtkvscale.h \
@@ -174,9 +184,6 @@ gtk_public_h_sources = \
gtkaccelmap.h \
gtkaccessible.h \
gtkactionable.h \
- gtkaction.h \
- gtkactiongroup.h \
- gtkactivatable.h \
gtkadjustment.h \
gtkalignment.h \
gtkappchooser.h \
@@ -249,11 +256,9 @@ gtk_public_h_sources = \
gtkframe.h \
gtkgrid.h \
gtkheaderbar.h \
- gtkiconfactory.h \
gtkicontheme.h \
gtkiconview.h \
gtkimage.h \
- gtkimagemenuitem.h \
gtkimcontext.h \
gtkimcontextinfo.h \
gtkimcontextsimple.h \
@@ -294,12 +299,10 @@ gtk_public_h_sources = \
gtkprintoperationpreview.h \
gtkprintsettings.h \
gtkprogressbar.h \
- gtkradioaction.h \
gtkradiobutton.h \
gtkradiomenuitem.h \
gtkradiotoolbutton.h \
gtkrange.h \
- gtkrecentaction.h \
gtkrecentchooser.h \
gtkrecentchooserdialog.h \
gtkrecentchoosermenu.h \
@@ -329,7 +332,6 @@ gtk_public_h_sources = \
gtkstackswitcher.h \
gtkstatusbar.h \
gtkstatusicon.h \
- gtkstock.h \
gtkstylecontext.h \
gtkstyleproperties.h \
gtkstyleprovider.h \
@@ -346,7 +348,6 @@ gtk_public_h_sources = \
gtktexttagtable.h \
gtktextview.h \
gtkthemingengine.h \
- gtktoggleaction.h \
gtktogglebutton.h \
gtktoggletoolbutton.h \
gtktoolbar.h \
@@ -366,7 +367,6 @@ gtk_public_h_sources = \
gtktreeview.h \
gtktreeviewcolumn.h \
gtktypes.h \
- gtkuimanager.h \
gtkviewport.h \
gtkvolumebutton.h \
gtkwidget.h \
@@ -563,6 +563,9 @@ gtk_private_h_sources = \
# GTK+ C sources to build the library from
deprecated_c_sources = \
+ deprecated/gtkactivatable.c \
+ deprecated/gtkaction.c \
+ deprecated/gtkactiongroup.c \
deprecated/gtkcolorsel.c \
deprecated/gtkcolorseldialog.c \
deprecated/gtkfontsel.c \
@@ -575,11 +578,18 @@ deprecated_c_sources = \
deprecated/gtkhscrollbar.c \
deprecated/gtkhseparator.c \
deprecated/gtkhsv.c \
+ deprecated/gtkiconfactory.c \
+ deprecated/gtkimagemenuitem.c \
+ deprecated/gtkradioaction.c \
deprecated/gtkrc.c \
+ deprecated/gtkrecentaction.c \
+ deprecated/gtkstock.c \
deprecated/gtkstyle.c \
deprecated/gtksymboliccolor.c \
deprecated/gtktable.c \
deprecated/gtktearoffmenuitem.c \
+ deprecated/gtktoggleaction.c \
+ deprecated/gtkuimanager.c \
deprecated/gtkvbbox.c \
deprecated/gtkvbox.c \
deprecated/gtkvscale.c \
@@ -604,10 +614,7 @@ gtk_base_c_sources = \
gtkaccellabel.c \
gtkaccelmap.c \
gtkaccessible.c \
- gtkaction.c \
gtkactionhelper.c \
- gtkactiongroup.c \
- gtkactivatable.c \
gtkadjustment.c \
gtkalignment.c \
gtkallocatedbitmask.c \
@@ -744,12 +751,10 @@ gtk_base_c_sources = \
gtkhsla.c \
gtkiconcache.c \
gtkiconcachevalidator.c \
- gtkiconfactory.c \
gtkiconhelper.c \
gtkicontheme.c \
gtkiconview.c \
gtkimage.c \
- gtkimagemenuitem.c \
gtkimcontext.c \
gtkimcontextsimple.c \
gtkimmodule.c \
@@ -802,13 +807,11 @@ gtk_base_c_sources = \
gtkprivatetypebuiltins.c \
gtkprogressbar.c \
gtkpixelcache.c \
- gtkradioaction.c \
gtkradiobutton.c \
gtkradiomenuitem.c \
gtkradiotoolbutton.c \
gtkrange.c \
gtkrbtree.c \
- gtkrecentaction.c \
gtkrecentchooserdefault.c \
gtkrecentchooserdialog.c \
gtkrecentchoosermenu.c \
@@ -840,7 +843,6 @@ gtk_base_c_sources = \
gtkstackswitcher.c \
gtkstatusbar.c \
gtkstatusicon.c \
- gtkstock.c \
gtkstyleanimation.c \
gtkstylecascade.c \
gtkstylecontext.c \
@@ -869,7 +871,6 @@ gtk_base_c_sources = \
gtktextview.c \
gtkthemingbackground.c \
gtkthemingengine.c \
- gtktoggleaction.c \
gtktogglebutton.c \
gtktoggletoolbutton.c \
gtktoolbar.c \
@@ -892,7 +893,6 @@ gtk_base_c_sources = \
gtktreeview.c \
gtktreeviewcolumn.c \
gtktypebuiltins.c \
- gtkuimanager.c \
gtkvolumebutton.c \
gtkviewport.c \
gtkwidget.c \
diff --git a/gtk/gtkaction.c b/gtk/deprecated/gtkaction.c
similarity index 100%
rename from gtk/gtkaction.c
rename to gtk/deprecated/gtkaction.c
diff --git a/gtk/gtkaction.h b/gtk/deprecated/gtkaction.h
similarity index 100%
rename from gtk/gtkaction.h
rename to gtk/deprecated/gtkaction.h
diff --git a/gtk/gtkactiongroup.c b/gtk/deprecated/gtkactiongroup.c
similarity index 100%
rename from gtk/gtkactiongroup.c
rename to gtk/deprecated/gtkactiongroup.c
diff --git a/gtk/gtkactiongroup.h b/gtk/deprecated/gtkactiongroup.h
similarity index 99%
rename from gtk/gtkactiongroup.h
rename to gtk/deprecated/gtkactiongroup.h
index 625fe89..e2e54ed 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/deprecated/gtkactiongroup.h
@@ -33,8 +33,8 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtkaction.h>
-#include <gtk/gtkstock.h>
+#include <gtk/deprecated/gtkaction.h>
+#include <gtk/deprecated/gtkstock.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkactivatable.c b/gtk/deprecated/gtkactivatable.c
similarity index 100%
rename from gtk/gtkactivatable.c
rename to gtk/deprecated/gtkactivatable.c
diff --git a/gtk/gtkactivatable.h b/gtk/deprecated/gtkactivatable.h
similarity index 98%
rename from gtk/gtkactivatable.h
rename to gtk/deprecated/gtkactivatable.h
index 5312ef1..3930386 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/deprecated/gtkactivatable.h
@@ -22,7 +22,7 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtkaction.h>
+#include <gtk/deprecated/gtkaction.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
similarity index 99%
rename from gtk/gtkiconfactory.c
rename to gtk/deprecated/gtkiconfactory.c
index ca54ad1..eb3a205 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -35,7 +35,7 @@
#include "gtkdebug.h"
#include "gtkicontheme.h"
#include "gtksettingsprivate.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtkwidget.h"
#include "gtkintl.h"
#include "gtkbuildable.h"
diff --git a/gtk/gtkiconfactory.h b/gtk/deprecated/gtkiconfactory.h
similarity index 100%
rename from gtk/gtkiconfactory.h
rename to gtk/deprecated/gtkiconfactory.h
diff --git a/gtk/gtkimagemenuitem.h b/gtk/deprecated/gtkimagemenuitem.h
similarity index 100%
rename from gtk/gtkimagemenuitem.h
rename to gtk/deprecated/gtkimagemenuitem.h
diff --git a/gtk/gtkradioaction.c b/gtk/deprecated/gtkradioaction.c
similarity index 100%
rename from gtk/gtkradioaction.c
rename to gtk/deprecated/gtkradioaction.c
diff --git a/gtk/gtkradioaction.h b/gtk/deprecated/gtkradioaction.h
similarity index 98%
rename from gtk/gtkradioaction.h
rename to gtk/deprecated/gtkradioaction.h
index d33cfb1..dce4986 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/deprecated/gtkradioaction.h
@@ -33,7 +33,7 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtktoggleaction.h>
+#include <gtk/deprecated/gtktoggleaction.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkrecentaction.c b/gtk/deprecated/gtkrecentaction.c
similarity index 100%
rename from gtk/gtkrecentaction.c
rename to gtk/deprecated/gtkrecentaction.c
diff --git a/gtk/gtkrecentaction.h b/gtk/deprecated/gtkrecentaction.h
similarity index 98%
rename from gtk/gtkrecentaction.h
rename to gtk/deprecated/gtkrecentaction.h
index 6ca717d..0cd77cf 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/deprecated/gtkrecentaction.h
@@ -24,7 +24,7 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtkaction.h>
+#include <gtk/deprecated/gtkaction.h>
#include <gtk/gtkrecentmanager.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkstock.c b/gtk/deprecated/gtkstock.c
similarity index 100%
rename from gtk/gtkstock.c
rename to gtk/deprecated/gtkstock.c
diff --git a/gtk/gtkstock.h b/gtk/deprecated/gtkstock.h
similarity index 100%
rename from gtk/gtkstock.h
rename to gtk/deprecated/gtkstock.h
diff --git a/gtk/gtktoggleaction.c b/gtk/deprecated/gtktoggleaction.c
similarity index 100%
rename from gtk/gtktoggleaction.c
rename to gtk/deprecated/gtktoggleaction.c
diff --git a/gtk/gtktoggleaction.h b/gtk/deprecated/gtktoggleaction.h
similarity index 99%
rename from gtk/gtktoggleaction.h
rename to gtk/deprecated/gtktoggleaction.h
index c89cbcb..695aa02 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/deprecated/gtktoggleaction.h
@@ -33,7 +33,7 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtkaction.h>
+#include <gtk/deprecated/gtkaction.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkuimanager.c b/gtk/deprecated/gtkuimanager.c
similarity index 100%
rename from gtk/gtkuimanager.c
rename to gtk/deprecated/gtkuimanager.c
diff --git a/gtk/gtkuimanager.h b/gtk/deprecated/gtkuimanager.h
similarity index 98%
rename from gtk/gtkuimanager.h
rename to gtk/deprecated/gtkuimanager.h
index b0ee553..e37d5a9 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/deprecated/gtkuimanager.h
@@ -35,8 +35,8 @@
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkwidget.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/deprecated/gtkaction.h>
+#include <gtk/deprecated/gtkactiongroup.h>
G_BEGIN_DECLS
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 1d48639..fa20539 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -33,10 +33,7 @@
#include <gtk/gtkaccellabel.h>
#include <gtk/gtkaccelmap.h>
#include <gtk/gtkaccessible.h>
-#include <gtk/gtkaction.h>
#include <gtk/gtkactionable.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkactivatable.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtkappchooser.h>
@@ -109,11 +106,9 @@
#include <gtk/gtkframe.h>
#include <gtk/gtkgrid.h>
#include <gtk/gtkheaderbar.h>
-#include <gtk/gtkiconfactory.h>
#include <gtk/gtkicontheme.h>
#include <gtk/gtkiconview.h>
#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtkimcontext.h>
#include <gtk/gtkimcontextinfo.h>
#include <gtk/gtkimcontextsimple.h>
@@ -152,12 +147,10 @@
#include <gtk/gtkprintoperationpreview.h>
#include <gtk/gtkprintsettings.h>
#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkradioaction.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkradiomenuitem.h>
#include <gtk/gtkradiotoolbutton.h>
#include <gtk/gtkrange.h>
-#include <gtk/gtkrecentaction.h>
#include <gtk/gtkrecentchooser.h>
#include <gtk/gtkrecentchooserdialog.h>
#include <gtk/gtkrecentchoosermenu.h>
@@ -186,7 +179,6 @@
#include <gtk/gtkstackswitcher.h>
#include <gtk/gtkstatusbar.h>
#include <gtk/gtkstatusicon.h>
-#include <gtk/gtkstock.h>
#include <gtk/gtkstylecontext.h>
#include <gtk/gtkstyleproperties.h>
#include <gtk/gtkstyleprovider.h>
@@ -201,7 +193,6 @@
#include <gtk/gtktexttagtable.h>
#include <gtk/gtktextview.h>
#include <gtk/gtkthemingengine.h>
-#include <gtk/gtktoggleaction.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtktoggletoolbutton.h>
#include <gtk/gtktoolbar.h>
@@ -223,7 +214,6 @@
#include <gtk/gtktreeviewcolumn.h>
#include <gtk/gtktypebuiltins.h>
#include <gtk/gtktypes.h>
-#include <gtk/gtkuimanager.h>
#include <gtk/gtkversion.h>
#include <gtk/gtkviewport.h>
#include <gtk/gtkvolumebutton.h>
@@ -232,6 +222,9 @@
#include <gtk/gtkwindow.h>
#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/gtkcolorseldialog.h>
#include <gtk/deprecated/gtkfontsel.h>
@@ -244,11 +237,18 @@
#include <gtk/deprecated/gtkhscale.h>
#include <gtk/deprecated/gtkhscrollbar.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/gtkrecentaction.h>
+#include <gtk/deprecated/gtkstock.h>
#include <gtk/deprecated/gtkstyle.h>
#include <gtk/deprecated/gtksymboliccolor.h>
#include <gtk/deprecated/gtktable.h>
#include <gtk/deprecated/gtktearoffmenuitem.h>
+#include <gtk/deprecated/gtktoggleaction.h>
+#include <gtk/deprecated/gtkuimanager.h>
#include <gtk/deprecated/gtkvbbox.h>
#include <gtk/deprecated/gtkvbox.h>
#include <gtk/deprecated/gtkvpaned.h>
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 70c3265..cb28cc5 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -44,7 +44,7 @@
#include "gtkorientable.h"
#include "gtkscrolledwindow.h"
#include "gtktextview.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkshow.h"
#include "gtkmain.h"
#include "gtkmessagedialog.h"
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index bb0ffc9..fc7bb28 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -52,7 +52,7 @@
#include "gtkbbox.h"
#include "gtkbutton.h"
#include "gtkmenuitem.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index a8ceb57..9184005 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -254,7 +254,7 @@
#include "gtktypebuiltins.h"
#include "gtkwindow.h"
#include "gtkicontheme.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
static void gtk_builder_class_init (GtkBuilderClass *klass);
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 26ce703..9c552bf 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -48,9 +48,9 @@
#include "gtkmarshalers.h"
#include "gtkimage.h"
#include "gtkbox.h"
-#include "gtkstock.h"
-#include "gtkiconfactory.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkstock.h"
+#include "deprecated/gtkiconfactory.h"
+#include "deprecated/gtkactivatable.h"
#include "gtksizerequest.h"
#include "gtktypebuiltins.h"
#include "gtkwidgetprivate.h"
diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index 54483de..67ef99c 100644
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -20,7 +20,7 @@
#define __GTK_BUTTON_PRIVATE_H__
#include "gtkactionhelper.h"
-#include "gtkaction.h"
+#include "deprecated/gtkaction.h"
G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 19c3725..4b67ee5 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <cairo-gobject.h>
#include "gtkcellrendererpixbuf.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkiconhelperprivate.h"
#include "gtkicontheme.h"
#include "gtkintl.h"
diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index 00c8ae8..f38fce1 100644
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -28,7 +28,7 @@
#include "config.h"
#include "gtkcellrendererspinner.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkintl.h"
#include "gtksettings.h"
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index e29d88e..a0837f3 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -26,8 +26,8 @@
#include "gtkcheckmenuitem.h"
#include "gtkmenuitemprivate.h"
#include "gtkaccellabel.h"
-#include "gtkactivatable.h"
-#include "gtktoggleaction.h"
+#include "deprecated/gtkactivatable.h"
+#include "deprecated/gtktoggleaction.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkintl.h"
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 28e9480..789c573 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -40,7 +40,7 @@
#include "gtkprivate.h"
#include "gtkbuildable.h"
#include "gtksettings.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
/**
* SECTION:gtkdialog
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index e1a6026..f7d42f4 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -30,7 +30,7 @@
#include "gdk/gdk.h"
#include "gtkdnd.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimageprivate.h"
#include "gtkinvisible.h"
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index cf4db84..fb8beba 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -40,13 +40,13 @@
#endif
#include "gtkdnd.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkiconhelperprivate.h"
#include "gtkicontheme.h"
#include "gtkinvisible.h"
#include "gtkmain.h"
#include "gtkplug.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtktooltip.h"
#include "gtkwindow.h"
#include "gtkintl.h"
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 1b7cf0f..2aea6bd 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -38,7 +38,7 @@
#include "gtkentry.h"
#include "gtkentrybuffer.h"
#include "gtkiconhelperprivate.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkimcontextsimple.h"
#include "gtkimmulticontext.h"
#include "gtkintl.h"
@@ -51,7 +51,7 @@
#include "gtkselection.h"
#include "gtksettings.h"
#include "gtkspinbutton.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtktextutil.h"
#include "gtkwindow.h"
#include "gtktreeview.h"
@@ -61,7 +61,7 @@
#include "gtkentryprivate.h"
#include "gtkcelllayout.h"
#include "gtktooltip.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkwidgetprivate.h"
#include "gtkstylecontextprivate.h"
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 6259b08..e4fc423 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -36,11 +36,11 @@
#include "gtkcombobox.h"
#include "gtkdnd.h"
#include "gtkicontheme.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkimage.h"
#include "gtklabel.h"
#include "gtkliststore.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtktreemodelfilter.h"
#include "gtkseparator.h"
#include "gtkfilechooserdialog.h"
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b25c0bc..bb4241e 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -45,10 +45,10 @@
#include "gtkfilesystemmodel.h"
#include "gtkframe.h"
#include "gtkgrid.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkinfobar.h"
#include "gtklabel.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
index 80750a3..45a49cf 100644
--- a/gtk/gtkfontchooserdialog.c
+++ b/gtk/gtkfontchooserdialog.c
@@ -28,7 +28,7 @@
#include "gtkfontchooserwidget.h"
#include "gtkfontchooserutils.h"
#include "gtkbox.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtkintl.h"
#include "gtkaccessible.h"
#include "gtkbuildable.h"
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 9cd192a..eb4c904 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -39,7 +39,7 @@
#include "gtkicontheme.h"
#include "gtkdebug.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkiconcache.h"
#include "gtkbuiltincache.h"
#include "gtkintl.h"
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 8b25a06..a6b6572 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -31,8 +31,8 @@
#include "gtkcontainer.h"
#include "gtkiconhelperprivate.h"
#include "gtkimageprivate.h"
-#include "gtkiconfactory.h"
-#include "gtkstock.h"
+#include "deprecated/gtkiconfactory.h"
+#include "deprecated/gtkstock.h"
#include "gtkicontheme.h"
#include "gtksizerequest.h"
#include "gtkintl.h"
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index d1e3a1c..bd805b6 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -45,7 +45,7 @@
#include "gtkprivate.h"
#include "gtkorientable.h"
#include "gtktypebuiltins.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
/**
* SECTION:gtkinfobar
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 36fe5c8..7f030e0 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -34,7 +34,7 @@
#include "gtkpango.h"
#include "gtkwindow.h"
#include "gtkclipboard.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtkseparatormenuitem.h"
#include "gtktextutil.h"
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index e3af4bd..56b4abf 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -52,7 +52,7 @@
#include "gtkclipboard.h"
#include "gtkdnd.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtklabel.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index f300bb4..1d50389 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -37,7 +37,7 @@
#include "gtkseparatormenuitem.h"
#include "gtkprivate.h"
#include "gtkbuildable.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkwidgetprivate.h"
#include "gtkintl.h"
#include "gtksettings.h"
diff --git a/gtk/gtkmenuitemprivate.h b/gtk/gtkmenuitemprivate.h
index 689e7d7..e3673df 100644
--- a/gtk/gtkmenuitemprivate.h
+++ b/gtk/gtkmenuitemprivate.h
@@ -19,7 +19,7 @@
#define __GTK_MENU_ITEM_PRIVATE_H__
#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkaction.h>
+#include <gtk/deprecated/gtkaction.h>
#include <gtk/gtkactionhelper.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 57504b0..0ce697d 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -33,7 +33,7 @@
#include "gtklabel.h"
#include "gtkbox.h"
#include "gtkimage.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtktypebuiltins.h"
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 3d566b5..5427ff2 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -46,7 +46,7 @@
#include "gtkcellrendererpixbuf.h"
#include "gtkscrolledwindow.h"
#include "gtkicontheme.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkmain.h"
#include <glib/gprintf.h>
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index d8f1be8..0402859 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -25,7 +25,7 @@
#include "gtkprivate.h"
#include "gtkliststore.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtktreeviewcolumn.h"
#include "gtktreeselection.h"
#include "gtktreemodel.h"
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index e8d15b8..c143e93 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -25,7 +25,7 @@
#include "gtkarrow.h"
#include "gtkbox.h"
#include "gtkdnd.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkintl.h"
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index cf0f952..63b66f4 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -56,7 +56,7 @@
#include "gtkcellrendererpixbuf.h"
#include "gtkfilechooserprivate.h"
#include "gtkicontheme.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index cbf0e2f..ed9b2ee 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -36,7 +36,7 @@
#include "gtkspinbutton.h"
#include "gtkcellrendererpixbuf.h"
#include "gtkcellrenderertext.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkimage.h"
#include "gtktreeselection.h"
#include "gtknotebook.h"
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index d59eb04..122d7d2 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -26,7 +26,7 @@
#include "gtkaccellabel.h"
#include "gtkmarshalers.h"
#include "gtkradiomenuitem.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "a11y/gtkradiomenuitemaccessible.h"
diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index af0b470..f10790d 100644
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -22,8 +22,8 @@
#include "gtkrecentchooser.h"
#include "gtkrecentchooserprivate.h"
#include "gtkrecentmanager.h"
-#include "gtkrecentaction.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkrecentaction.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 85a5bcd..20f1fbc 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -28,7 +28,7 @@
#endif
#include "gtkicontheme.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtksettings.h"
#include "gtktreeview.h"
#include "gtkliststore.h"
@@ -46,7 +46,7 @@
#include "gtkbox.h"
#include "gtkpaned.h"
#include "gtkimage.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtklabel.h"
#include "gtkmenuitem.h"
@@ -62,7 +62,7 @@
#include "gtktooltip.h"
#include "gtktypebuiltins.h"
#include "gtkorientable.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkrecentmanager.h"
#include "gtkrecentfilter.h"
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index f1ce847..65fd1a5 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -27,20 +27,20 @@
#include "gtkrecentchooserprivate.h"
#include "gtkrecentchoosermenu.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtkicontheme.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkintl.h"
#include "gtksettings.h"
#include "gtkmenushell.h"
#include "gtkmenuitem.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkseparatormenuitem.h"
#include "gtkmenu.h"
#include "gtkimage.h"
#include "gtklabel.h"
#include "gtktooltip.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
diff --git a/gtk/gtkrecentchooserprivate.h b/gtk/gtkrecentchooserprivate.h
index 8ff874d..8e1be08 100644
--- a/gtk/gtkrecentchooserprivate.h
+++ b/gtk/gtkrecentchooserprivate.h
@@ -23,7 +23,7 @@
#include "gtkrecentmanager.h"
#include "gtkrecentchooser.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
G_BEGIN_DECLS
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index ab96db2..b03b12d 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -103,7 +103,7 @@
#include "gtkrecentmanager.h"
#include "gtkintl.h"
#include "gtksettings.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtkicontheme.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 46b7ceb..1e951b6 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -34,7 +34,7 @@
#include "gtkbindings.h"
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 13d29d4..95ea50f 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -46,7 +46,7 @@
#include "gtkorientableprivate.h"
#include "gtkprivate.h"
#include "gtksettings.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtktypebuiltins.h"
#include "gtkwidgetpath.h"
#include "gtkwidgetprivate.h"
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index dd21d4b..8fccfb3 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -33,7 +33,7 @@
#include "gtkstatusicon.h"
#include "gtkintl.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkiconhelperprivate.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 890688c..5807241 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -37,7 +37,7 @@
#include "gtkwidget.h"
#include "gtkwindow.h"
#include "gtkprivate.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkwidgetpath.h"
#include "gtkwidgetprivate.h"
#include "gtkstylecascadeprivate.h"
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index 74ce032..57fef53 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <gtk/gtkenums.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/deprecated/gtkiconfactory.h>
#include <gtk/gtkstyleproperties.h>
#include <gtk/gtktypes.h>
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index c296fe7..382fbc4 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -38,10 +38,10 @@
#include "gtkswitch.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkintl.h"
#include "gtkprivate.h"
-#include "gtktoggleaction.h"
+#include "deprecated/gtktoggleaction.h"
#include "gtkwidget.h"
#include "gtkmarshalers.h"
#include "gtkapplicationprivate.h"
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 32e7e40..0f1db37 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -30,7 +30,7 @@
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkbindings.h"
#include "gtkdnd.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 4697ae9..21eab4a 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -30,8 +30,8 @@
#include "gtklabel.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtktoggleaction.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtktoggleaction.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "a11y/gtktogglebuttonaccessible.h"
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index 4db54aa..eb74549 100644
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -22,11 +22,11 @@
#include "gtkcheckmenuitem.h"
#include "gtklabel.h"
#include "gtktogglebutton.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtkintl.h"
#include "gtkradiotoolbutton.h"
-#include "gtktoggleaction.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtktoggleaction.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index b9c5fa8..b02663b 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -49,7 +49,7 @@
#include "gtkradiotoolbutton.h"
#include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtktoolshell.h"
#include "gtkbox.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index e079fae..dee9f94 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -21,15 +21,15 @@
#include "config.h"
#include "gtktoolbutton.h"
#include "gtkbutton.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkimage.h"
-#include "gtkimagemenuitem.h"
+#include "deprecated/gtkimagemenuitem.h"
#include "gtklabel.h"
-#include "gtkstock.h"
+#include "deprecated/gtkstock.h"
#include "gtkbox.h"
#include "gtkintl.h"
#include "gtktoolbar.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkactionable.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index b29a295..01634d0 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -28,7 +28,7 @@
#include "gtktoolshell.h"
#include "gtkseparatormenuitem.h"
#include "gtksizerequest.h"
-#include "gtkactivatable.h"
+#include "deprecated/gtkactivatable.h"
#include "gtkintl.h"
#include "gtkprivate.h"
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 865892a..347f8b3 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -38,7 +38,7 @@
#include "gtkclipboard.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkcssnumbervalueprivate.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkselectionprivate.h"
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3d0847c..1197651 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -40,7 +40,7 @@
#include "gtkmain.h"
#include "gtkmnemonichash.h"
#include "gtkmenubar.h"
-#include "gtkiconfactory.h"
+#include "deprecated/gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkmarshalers.h"
#include "gtkplug.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
