X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleproperties.h;h=fd81699678a0592c6523579fd076f8148e595b0d;hb=3c8e1c92a85b2e41161698f141747ced2c574f32;hp=113fe44f937857d30bc07e415ef36f44afdae0f5;hpb=0d786985a368d88e8ab4e45fc3607efc5e773732;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index 113fe44f9..fd8169967 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -12,18 +12,16 @@
  * 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
 
-#ifndef __GTK_STYLE_PROPERTIES_H__
-#define __GTK_STYLE_PROPERTIES_H__
-
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
@@ -39,6 +37,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtkStyleProperties GtkStyleProperties;
 typedef struct _GtkStylePropertiesClass GtkStylePropertiesClass;
+typedef struct _GtkStylePropertiesPrivate GtkStylePropertiesPrivate;
 
 typedef struct _GtkSymbolicColor GtkSymbolicColor;
 typedef struct _GtkGradient GtkGradient;
@@ -46,12 +45,18 @@ 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,
@@ -60,23 +65,22 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
 
 GType gtk_style_properties_get_type (void) G_GNUC_CONST;
 
-/* Semi-private API */
-const GValue * _gtk_style_properties_peek_property (GtkStyleProperties *props,
-                                                    const gchar        *prop_name,
-                                                    GtkStateFlags       state);
-
-/* Functions to register style properties */
+/* 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);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *props,
                                                       const gchar        *name);