summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2014-10-24 21:31:15 +0200
committerBenjamin Otte <otte@redhat.com>2014-10-24 21:31:40 +0200
commit2002613012f521d04cf51596a52db074cedfb14d (patch)
tree8b54e967567fa87810eed02eb3f3263b00a328b2
parenta51378dda882115449b185aaa33b921d397568c9 (diff)
downloadgtk+-2002613012f521d04cf51596a52db074cedfb14d.tar.gz
styleproperties: Move into deprecated directory
-rw-r--r--gtk/Makefile.am6
-rw-r--r--gtk/deprecated/gtkgradient.h2
-rw-r--r--gtk/deprecated/gtkstyleproperties.c (renamed from gtk/gtkstyleproperties.c)0
-rw-r--r--gtk/deprecated/gtkstyleproperties.h (renamed from gtk/gtkstyleproperties.h)0
-rw-r--r--gtk/deprecated/gtkstylepropertiesprivate.h (renamed from gtk/gtkstylepropertiesprivate.h)0
-rw-r--r--gtk/deprecated/gtksymboliccolor.h2
-rw-r--r--gtk/deprecated/gtkthemingengine.h2
-rw-r--r--gtk/gtk.h2
-rw-r--r--gtk/gtkstyleprovider.h2
9 files changed, 8 insertions, 8 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b840f1600b..f60bec87a7 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -239,6 +239,7 @@ deprecated_h_sources = \
deprecated/gtkstatusicon.h \
deprecated/gtkstock.h \
deprecated/gtkstyle.h \
+ deprecated/gtkstyleproperties.h \
deprecated/gtksymboliccolor.h \
deprecated/gtktable.h \
deprecated/gtktearoffmenuitem.h \
@@ -271,6 +272,7 @@ a11y_private_h_sources = \
deprecated_private_h_sources = \
deprecated/gtkgradientprivate.h \
deprecated/gtknumerableiconprivate.h \
+ deprecated/gtkstylepropertiesprivate.h \
deprecated/gtksymboliccolorprivate.h
gtk_public_h_sources = \
@@ -443,7 +445,6 @@ gtk_public_h_sources = \
gtkstackswitcher.h \
gtkstatusbar.h \
gtkstylecontext.h \
- gtkstyleproperties.h \
gtkstyleprovider.h \
gtkswitch.h \
gtktestutils.h \
@@ -655,7 +656,6 @@ gtk_private_h_sources = \
gtkstyleanimationprivate.h \
gtkstylecascadeprivate.h \
gtkstylecontextprivate.h \
- gtkstylepropertiesprivate.h \
gtkstylepropertyprivate.h \
gtkstyleproviderprivate.h \
gtktextbtree.h \
@@ -768,6 +768,7 @@ deprecated_c_sources = \
deprecated/gtkstatusicon.c \
deprecated/gtkstock.c \
deprecated/gtkstyle.c \
+ deprecated/gtkstyleproperties.c \
deprecated/gtksymboliccolor.c \
deprecated/gtktable.c \
deprecated/gtktearoffmenuitem.c \
@@ -1047,7 +1048,6 @@ gtk_base_c_sources = \
gtkstyleanimation.c \
gtkstylecascade.c \
gtkstylecontext.c \
- gtkstyleproperties.c \
gtkstyleproperty.c \
gtkstyleprovider.c \
gtkstyleproviderprivate.c \
diff --git a/gtk/deprecated/gtkgradient.h b/gtk/deprecated/gtkgradient.h
index 6eccb3bf23..e0d3e348ca 100644
--- a/gtk/deprecated/gtkgradient.h
+++ b/gtk/deprecated/gtkgradient.h
@@ -24,7 +24,7 @@
#include <gdk/gdk.h>
#include <gtk/gtkstylecontext.h>
-#include <gtk/gtkstyleproperties.h>
+#include <gtk/deprecated/gtkstyleproperties.h>
#include <gtk/deprecated/gtksymboliccolor.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkstyleproperties.c b/gtk/deprecated/gtkstyleproperties.c
index f61f7a2b6d..f61f7a2b6d 100644
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/deprecated/gtkstyleproperties.c
diff --git a/gtk/gtkstyleproperties.h b/gtk/deprecated/gtkstyleproperties.h
index c59c7af783..c59c7af783 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/deprecated/gtkstyleproperties.h
diff --git a/gtk/gtkstylepropertiesprivate.h b/gtk/deprecated/gtkstylepropertiesprivate.h
index 77268d9cce..77268d9cce 100644
--- a/gtk/gtkstylepropertiesprivate.h
+++ b/gtk/deprecated/gtkstylepropertiesprivate.h
diff --git a/gtk/deprecated/gtksymboliccolor.h b/gtk/deprecated/gtksymboliccolor.h
index 860704faf2..8beded60db 100644
--- a/gtk/deprecated/gtksymboliccolor.h
+++ b/gtk/deprecated/gtksymboliccolor.h
@@ -23,7 +23,7 @@
#endif
#include <gdk/gdk.h>
-#include <gtk/gtkstyleproperties.h>
+#include <gtk/deprecated/gtkstyleproperties.h>
G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkthemingengine.h b/gtk/deprecated/gtkthemingengine.h
index 469504fe43..e04fc1c539 100644
--- a/gtk/deprecated/gtkthemingengine.h
+++ b/gtk/deprecated/gtkthemingengine.h
@@ -27,7 +27,7 @@
#include <gtk/gtkborder.h>
#include <gtk/gtkenums.h>
-#include <gtk/gtkstyleproperties.h>
+#include <gtk/deprecated/gtkstyleproperties.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 937a073d0b..5955dd90bb 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -191,7 +191,6 @@
#include <gtk/gtkstackswitcher.h>
#include <gtk/gtkstatusbar.h>
#include <gtk/gtkstylecontext.h>
-#include <gtk/gtkstyleproperties.h>
#include <gtk/gtkstyleprovider.h>
#include <gtk/gtkswitch.h>
#include <gtk/gtktextattributes.h>
@@ -260,6 +259,7 @@
#include <gtk/deprecated/gtkstatusicon.h>
#include <gtk/deprecated/gtkstock.h>
#include <gtk/deprecated/gtkstyle.h>
+#include <gtk/deprecated/gtkstyleproperties.h>
#include <gtk/deprecated/gtksymboliccolor.h>
#include <gtk/deprecated/gtktable.h>
#include <gtk/deprecated/gtktearoffmenuitem.h>
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index a33ce4345a..cbfd9df2a2 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <gtk/gtkenums.h>
#include <gtk/deprecated/gtkiconfactory.h>
-#include <gtk/gtkstyleproperties.h>
+#include <gtk/deprecated/gtkstyleproperties.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS