[gtk+] Move gtkthemingengine to deprecated directory

[Matthias Clasen <matthiasc src gnome org>]

commit e014b8931036e5e1f09108520c0ac0c4efe250e6
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Aug 29 16:33:37 2014 -0400

    Move gtkthemingengine to deprecated directory
    
    This is the place for wholly-deprecated sources.

 gtk/Makefile.am                                |    6 +++---
 gtk/{ => deprecated}/gtkthemingengine.c        |    0
 gtk/{ => deprecated}/gtkthemingengine.h        |    0
 gtk/{ => deprecated}/gtkthemingengineprivate.h |    2 +-
 gtk/gtk.h                                      |    2 +-
 gtk/gtkborderimage.c                           |    1 -
 gtk/gtkcsscustomproperty.c                     |    3 ++-
 gtk/gtkcssenginevalueprivate.h                 |    2 +-
 gtk/gtkcssshadowvalue.c                        |    3 ++-
 gtk/gtkcssstylefuncs.c                         |    2 +-
 gtk/gtkcssstylepropertyimpl.c                  |    3 ++-
 gtk/gtkstylecontext.c                          |    2 +-
 gtk/gtkstyleproperties.c                       |    2 +-
 testsuite/css/parser/test-css-parser.c         |    2 ++
 14 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1168852..349b712 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -246,6 +246,7 @@ deprecated_h_sources =                      \
        deprecated/gtksymboliccolor.h   \
        deprecated/gtktable.h           \
        deprecated/gtktearoffmenuitem.h \
+       deprecated/gtkthemingengine.h   \
        deprecated/gtktoggleaction.h    \
        deprecated/gtkuimanager.h       \
        deprecated/gtkvbbox.h           \
@@ -457,7 +458,6 @@ gtk_public_h_sources =              \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
-       gtkthemingengine.h      \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
        gtktoolbar.h            \
@@ -668,7 +668,7 @@ gtk_private_h_sources =             \
        gtktexttypes.h          \
        gtktextutil.h           \
        gtkthemingbackgroundprivate.h \
-       gtkthemingengineprivate.h \
+       deprecated/gtkthemingengineprivate.h \
        gtktrashmonitor.h       \
        gtktoolbarprivate.h     \
        gtktoolpaletteprivate.h \
@@ -769,6 +769,7 @@ deprecated_c_sources =                      \
        deprecated/gtksymboliccolor.c   \
        deprecated/gtktable.c           \
        deprecated/gtktearoffmenuitem.c \
+       deprecated/gtkthemingengine.c   \
        deprecated/gtktoggleaction.c    \
        deprecated/gtkuimanager.c       \
        deprecated/gtkvbbox.c           \
@@ -1063,7 +1064,6 @@ gtk_base_c_sources =              \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemingbackground.c  \
-       gtkthemingengine.c      \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
        gtktoolbar.c            \
diff --git a/gtk/gtkthemingengine.c b/gtk/deprecated/gtkthemingengine.c
similarity index 100%
rename from gtk/gtkthemingengine.c
rename to gtk/deprecated/gtkthemingengine.c
diff --git a/gtk/gtkthemingengine.h b/gtk/deprecated/gtkthemingengine.h
similarity index 100%
rename from gtk/gtkthemingengine.h
rename to gtk/deprecated/gtkthemingengine.h
diff --git a/gtk/gtkthemingengineprivate.h b/gtk/deprecated/gtkthemingengineprivate.h
similarity index 96%
rename from gtk/gtkthemingengineprivate.h
rename to gtk/deprecated/gtkthemingengineprivate.h
index 245eb96..850c9fe 100644
--- a/gtk/gtkthemingengineprivate.h
+++ b/gtk/deprecated/gtkthemingengineprivate.h
@@ -19,7 +19,7 @@
 #define __GTK_THEMING_ENGINE_PRIVATE_H__
 
 #include <gdk/gdk.h>
-#include "gtk/gtkthemingengine.h"
+#include "gtk/deprecated/gtkthemingengine.h"
 #include "gtk/gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 549b8d6..b027dc6 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -200,7 +200,6 @@
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktexttagtable.h>
 #include <gtk/gtktextview.h>
-#include <gtk/gtkthemingengine.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtktoggletoolbutton.h>
 #include <gtk/gtktoolbar.h>
@@ -261,6 +260,7 @@
 #include <gtk/deprecated/gtksymboliccolor.h>
 #include <gtk/deprecated/gtktable.h>
 #include <gtk/deprecated/gtktearoffmenuitem.h>
+#include <gtk/deprecated/gtkthemingengine.h>
 #include <gtk/deprecated/gtktoggleaction.h>
 #include <gtk/deprecated/gtkuimanager.h>
 #include <gtk/deprecated/gtkvbbox.h>
diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c
index b6e7346..49a619a 100644
--- a/gtk/gtkborderimage.c
+++ b/gtk/gtkborderimage.c
@@ -30,7 +30,6 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssrepeatvalueprivate.h"
 #include "gtkstylepropertiesprivate.h"
-#include "gtkthemingengineprivate.h"
 
 /* this is in case round() is not provided by the compiler, 
  * such as in the case of C89 compilers, like MSVC
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 5b3c1c3..a8be088 100644
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -26,7 +26,8 @@
 #include "gtkcssstylefuncsprivate.h"
 #include "gtkcsstypedvalueprivate.h"
 #include "gtkstylepropertiesprivate.h"
-#include "gtkthemingengine.h"
+
+#include "deprecated/gtkthemingengine.h"
 
 #include "deprecated/gtksymboliccolor.h"
 
diff --git a/gtk/gtkcssenginevalueprivate.h b/gtk/gtkcssenginevalueprivate.h
index 888c07a..36f1101 100644
--- a/gtk/gtkcssenginevalueprivate.h
+++ b/gtk/gtkcssenginevalueprivate.h
@@ -22,7 +22,7 @@
 
 #include "gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
-#include "gtkthemingengine.h"
+#include "deprecated/gtkthemingengine.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index 0648352..507d66c 100644
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -26,9 +26,10 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkstylecontextprivate.h"
-#include "gtkthemingengineprivate.h"
 #include "gtkpango.h"
 
+#include "deprecated/gtkthemingengineprivate.h"
+
 #include <math.h>
 
 struct _GtkCssValue {
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index a2da562..d196550 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -35,10 +35,10 @@
 #include "gtkcsstypesprivate.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkstylecontextprivate.h"
-#include "gtkthemingengine.h"
 #include "gtktypebuiltins.h"
 #include "gtkwin32themeprivate.h"
 
+#include "deprecated/gtkthemingengine.h"
 #include "deprecated/gtkgradientprivate.h"
 #include "deprecated/gtksymboliccolorprivate.h"
 
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 0cb791c..64004d1 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -58,10 +58,11 @@
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcssstringvalueprivate.h"
 #include "gtkcsstransformvalueprivate.h"
-#include "gtkthemingengine.h"
 #include "gtktypebuiltins.h"
 #include "gtkwin32themeprivate.h"
 
+#include "deprecated/gtkthemingengine.h"
+
 /*** REGISTRATION ***/
 
 typedef enum {
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 93575e1..7bcaab6 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -36,7 +36,6 @@
 #include "gtkdebug.h"
 #include "gtkstylepropertiesprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkthemingengineprivate.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkwindow.h"
@@ -48,6 +47,7 @@
 #include "gtksettings.h"
 #include "gtksettingsprivate.h"
 
+#include "deprecated/gtkthemingengineprivate.h"
 #include "deprecated/gtkgradientprivate.h"
 #include "deprecated/gtksymboliccolorprivate.h"
 
diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index 2e385b3..e617020 100644
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -24,7 +24,6 @@
 #include <cairo-gobject.h>
 
 #include "gtkstyleprovider.h"
-#include "gtkthemingengine.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcsstypedvalueprivate.h"
 #include "gtkcsstypesprivate.h"
@@ -36,6 +35,7 @@
 #include "gtkintl.h"
 #include "gtkwin32themeprivate.h"
 
+#include "deprecated/gtkthemingengine.h"
 #include "deprecated/gtkgradient.h"
 #include "deprecated/gtksymboliccolorprivate.h"
 
diff --git a/testsuite/css/parser/test-css-parser.c b/testsuite/css/parser/test-css-parser.c
index f985d86..6561de4 100644
--- a/testsuite/css/parser/test-css-parser.c
+++ b/testsuite/css/parser/test-css-parser.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <string.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>