Remove gtkalias from style context code.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index f9780c242078efea9cd6ceef2476db06fa301378..058c1d3450003506ae63b36471f881a12346bc95 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -27,8 +27,6 @@
 #include "gtkanimationdescription.h"
 #include "gtkcssprovider.h"
 
-#include "gtkalias.h"
-
 typedef struct GtkCssProviderPrivate GtkCssProviderPrivate;
 typedef struct SelectorElement SelectorElement;
 typedef struct SelectorPath SelectorPath;
@@ -1821,6 +1819,3 @@ gtk_css_provider_get_named (const gchar *name)
 
   return provider;
 }
-
-#define __GTK_CSS_PROVIDER_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index f7f236d26274b9507941951b09c09922730399b8..6c3fa2b46f34b51096a8adc3a33a945ce5ba9a45 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -32,8 +32,6 @@
 #include "gtkanimationdescription.h"
 #include "gtktimeline.h"
 
-#include "gtkalias.h"
-
 typedef struct GtkStyleContextPrivate GtkStyleContextPrivate;
 typedef struct GtkStyleProviderData GtkStyleProviderData;
 typedef struct GtkStyleInfo GtkStyleInfo;
@@ -2085,6 +2083,3 @@ gtk_render_handle (GtkStyleContext *context,
   _gtk_theming_engine_set_context (priv->theming_engine, context);
   engine_class->render_handle (priv->theming_engine, cr, x, y, width, height, orientation);
 }
-
-#define __GTK_STYLE_CONTEXT_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 4240176f24e992d59adbf36949e502aac3887d62..2c23a80edb94361b1f8a2e8642cf548aded970a8 100644 (file)
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -23,8 +23,6 @@
 #include "gtkstyleprovider.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
-
 static void gtk_style_provider_iface_init (gpointer g_iface);
 
 GType
@@ -99,6 +97,3 @@ gtk_style_provider_get_icon_factory (GtkStyleProvider *provider,
 
   return iface->get_icon_factory (provider, path);
 }
-
-#define __GTK_STYLE_PROVIDER_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkstyleset.c b/gtk/gtkstyleset.c
index a9df3a1201344962592297cd39a3545e055a0f2a..5c634100e0a6ce4038379970dec811e9e99ee5f3 100644 (file)
--- a/gtk/gtkstyleset.c
+++ b/gtk/gtkstyleset.c
@@ -29,8 +29,6 @@
 #include "gtkanimationdescription.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
-
 typedef struct GtkStyleSetPrivate GtkStyleSetPrivate;
 typedef struct PropertyData PropertyData;
 typedef struct PropertyNode PropertyNode;
@@ -882,6 +880,3 @@ gtk_style_set_merge (GtkStyleSet       *set,
         }
     }
 }
-
-#define __GTK_STYLE_SET_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtksymboliccolor.c b/gtk/gtksymboliccolor.c
index 569f3066f08f3754499f8e9969843654e083f956..9b9386b4cd13c664b83212b2efbd0b882f787063 100644 (file)
--- a/gtk/gtksymboliccolor.c
+++ b/gtk/gtksymboliccolor.c
@@ -240,6 +240,3 @@ gtk_symbolic_color_get_type (void)
 
   return type;
 }
-
-#define __GTK_SYMBOLIC_COLOR_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index ef7a863cb5a04326ae538e3150ef65f0e023721f..10f4117557276e1d3f2a660dad4089526c6395c8 100644 (file)
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -26,8 +26,6 @@
 #include <gtk/gtkstylecontext.h>
 #include <gtk/gtkintl.h>
 
-#include "gtkalias.h"
-
 typedef struct GtkThemingEnginePrivate GtkThemingEnginePrivate;
 
 enum {
@@ -1919,6 +1917,3 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine,
 
   gdk_color_free (bg_color);
 }
-
-#define __GTK_THEMING_ENGINE_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtktimeline.c b/gtk/gtktimeline.c
index b4c034d700137e76f161d1fa5ef24f44f1477d3b..348011c768c8bc6137e2754e27d238b648bdeef4 100644 (file)
--- a/gtk/gtktimeline.c
+++ b/gtk/gtktimeline.c
@@ -733,6 +733,3 @@ gtk_timeline_set_progress_type (GtkTimeline             *timeline,
   priv = timeline->priv;
   priv->progress_type = progress_type;
 }
-
-#define __GTK_TIMELINE_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c
index 0f5e420a4163dc023039c2e138d12f312741602d..933a2dc0c7cc21537e74ee7c3f2e0bacc90557f4 100644 (file)
--- a/gtk/gtkwidgetpath.c
+++ b/gtk/gtkwidgetpath.c
@@ -597,6 +597,3 @@ gtk_widget_path_has_parent (const GtkWidgetPath *path,
 
   return FALSE;
 }
-
-#define __GTK_WIDGET_PATH_C__
-#include "gtkaliasdef.c"