X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleproperties.h;h=fd81699678a0592c6523579fd076f8148e595b0d;hb=7260e0570cc44dddd5dec88ff9a13a1824318f22;hp=b12c223b1b5fb49f64d9fa6544a4d234b672f7a4;hpb=4acc20abc142356c581dc58328fff408aed7a6b8;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index b12c223b1..fd8169967 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -12,18 +12,19 @@
  * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_STYLE_PROPERTIES_H__
 #define __GTK_STYLE_PROPERTIES_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <gdk/gdk.h>
-#include "gtkenums.h"
-#include "gtksymboliccolor.h"
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
@@ -36,16 +37,26 @@ G_BEGIN_DECLS
 
 typedef struct _GtkStyleProperties GtkStyleProperties;
 typedef struct _GtkStylePropertiesClass GtkStylePropertiesClass;
+typedef struct _GtkStylePropertiesPrivate GtkStylePropertiesPrivate;
+
+typedef struct _GtkSymbolicColor GtkSymbolicColor;
+typedef struct _GtkGradient GtkGradient;
 
 struct _GtkStyleProperties
 {
   GObject parent_object;
-  gpointer priv;
+  GtkStylePropertiesPrivate *priv;
 };
 
 struct _GtkStylePropertiesClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
@@ -54,21 +65,23 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
 
 GType gtk_style_properties_get_type (void) G_GNUC_CONST;
 
-/* Functions to register style properties */
-void     gtk_style_properties_register_property (const gchar            *property_name,
-                                                 GType                   type,
-                                                 const GValue           *default_value,
-                                                 GtkStylePropertyParser  parse_func);
-gboolean gtk_style_properties_lookup_property   (const gchar            *property_name,
-                                                 GType                  *type,
-                                                 GtkStylePropertyParser *parse_func);
+/* Next 2 are implemented in gtkcsscustomproperty.c */
+GDK_DEPRECATED_IN_3_8
+void     gtk_style_properties_register_property (GtkStylePropertyParser  parse_func,
+                                                 GParamSpec             *pspec);
+GDK_DEPRECATED_IN_3_8
+gboolean gtk_style_properties_lookup_property   (const gchar             *property_name,
+                                                 GtkStylePropertyParser  *parse_func,
+                                                 GParamSpec             **pspec);
 
 GtkStyleProperties * gtk_style_properties_new (void);
 
+GDK_DEPRECATED_IN_3_8
 void               gtk_style_properties_map_color    (GtkStyleProperties *props,
                                                       const gchar        *name,
                                                       GtkSymbolicColor   *color);
-GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *set,
+GDK_DEPRECATED_IN_3_8
+GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *props,
                                                       const gchar        *name);
 
 void     gtk_style_properties_set_property (GtkStyleProperties *props,
@@ -103,13 +116,6 @@ void     gtk_style_properties_merge          (GtkStyleProperties       *props,
                                               const GtkStyleProperties *props_to_merge,
                                               gboolean                  replace);
 
-gboolean gtk_symbolic_color_resolve (GtkSymbolicColor    *color,
-				     GtkStyleProperties  *props,
-                                     GdkRGBA             *resolved_color);
-gboolean gtk_gradient_resolve (GtkGradient         *gradient,
-                               GtkStyleProperties  *props,
-                               cairo_pattern_t    **resolved_gradient);
-
 G_END_DECLS
 
 #endif /* __GTK_STYLE_PROPERTIES_H__ */