From 046d004725cf120e9c9d7524def123760019a812 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 2 Oct 2012 12:15:22 +0200 Subject: [PATCH] gradient: Add a private header file --- gtk/Makefile.am | 1 + gtk/gtkcssimagegradient.c | 2 +- gtk/gtkcssstylefuncs.c | 2 +- gtk/gtkgradient.c | 6 ++++-- gtk/gtkgradientprivate.h | 34 +++++++++++++++++++++++++++++++++ gtk/gtkstylecontext.c | 1 + gtk/gtkstylepropertiesprivate.h | 7 ------- 7 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 gtk/gtkgradientprivate.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2f21bbf23..7e9ebffea 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -477,6 +477,7 @@ gtk_private_h_sources = \ gtkfilesystemmodel.h \ gtkfontchooserprivate.h \ gtkfontchooserutils.h \ + gtkgradientprivate.h \ gtkiconcache.h \ gtkiconhelperprivate.h \ gtkiconviewprivate.h \ diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c index 2e710672c..30bfab35e 100644 --- a/gtk/gtkcssimagegradient.c +++ b/gtk/gtkcssimagegradient.c @@ -22,8 +22,8 @@ #include "gtkcssimagegradientprivate.h" #include "gtkcssprovider.h" +#include "gtkgradientprivate.h" #include "gtksymboliccolorprivate.h" -#include "gtkstylepropertiesprivate.h" G_DEFINE_TYPE (GtkCssImageGradient, _gtk_css_image_gradient, GTK_TYPE_CSS_IMAGE) diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c index 182837a16..283420a2f 100644 --- a/gtk/gtkcssstylefuncs.c +++ b/gtk/gtkcssstylefuncs.c @@ -33,9 +33,9 @@ #include "gtkcsstypedvalueprivate.h" #include "gtkcsstypesprivate.h" #include "gtkgradient.h" +#include "gtkgradientprivate.h" #include "gtkprivatetypebuiltins.h" #include "gtkstylecontextprivate.h" -#include "gtkstylepropertiesprivate.h" #include "gtksymboliccolorprivate.h" #include "gtkthemingengine.h" #include "gtktypebuiltins.h" diff --git a/gtk/gtkgradient.c b/gtk/gtkgradient.c index 1586757c9..ee5706611 100644 --- a/gtk/gtkgradient.c +++ b/gtk/gtkgradient.c @@ -16,11 +16,13 @@ */ #include "config.h" -#include "gtkgradient.h" + +#include "gtkgradientprivate.h" + #include "gtkcssrgbavalueprivate.h" #include "gtkstylecontextprivate.h" #include "gtkstyleproperties.h" -#include "gtkstylepropertiesprivate.h" +#include "gtksymboliccolorprivate.h" /** * SECTION:gtkgradient diff --git a/gtk/gtkgradientprivate.h b/gtk/gtkgradientprivate.h new file mode 100644 index 000000000..1ad2eef2e --- /dev/null +++ b/gtk/gtkgradientprivate.h @@ -0,0 +1,34 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2012 Benjamin Otte + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +#ifndef __GTK_GRADIENT_PRIVATE_H__ +#define __GTK_GRADIENT_PRIVATE_H__ + +#include "gtkgradient.h" +#include "gtkcsstypesprivate.h" + +G_BEGIN_DECLS + +cairo_pattern_t * _gtk_gradient_resolve_full (GtkGradient *gradient, + GtkStyleProviderPrivate *provider, + GtkCssComputedValues *values, + GtkCssComputedValues *parent_values, + GtkCssDependencies *dependencies); + +G_END_DECLS + +#endif /* __GTK_STYLE_PROPERTIES_PRIVATE_H__ */ diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 67cba7e77..a6b7369b3 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -28,6 +28,7 @@ #include "gtkcssnumbervalueprivate.h" #include "gtkcssrgbavalueprivate.h" #include "gtkdebug.h" +#include "gtkgradientprivate.h" #include "gtkstylepropertiesprivate.h" #include "gtktypebuiltins.h" #include "gtkthemingengineprivate.h" diff --git a/gtk/gtkstylepropertiesprivate.h b/gtk/gtkstylepropertiesprivate.h index 2e1bd97af..c5b742e79 100644 --- a/gtk/gtkstylepropertiesprivate.h +++ b/gtk/gtkstylepropertiesprivate.h @@ -33,13 +33,6 @@ void _gtk_style_properties_set_property_by_property (GtkStylePropertie GtkStateFlags state, GtkCssValue *value); -cairo_pattern_t * - _gtk_gradient_resolve_full (GtkGradient *gradient, - GtkStyleProviderPrivate *provider, - GtkCssComputedValues *values, - GtkCssComputedValues *parent_values, - GtkCssDependencies *dependencies); - G_END_DECLS #endif /* __GTK_STYLE_PROPERTIES_PRIVATE_H__ */ -- 2.43.2