X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleproperties.h;h=fd81699678a0592c6523579fd076f8148e595b0d;hb=e54f8f4c623182b6870b27ef283cae2e71749662;hp=8a243b7f4f6f807ce046218e9ae2618b0308fc83;hpb=e598f17871086a233e9bfabae98c56908201e3e3;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index 8a243b7f4..fd8169967 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -12,14 +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
+
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
@@ -35,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;
@@ -42,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,
@@ -56,18 +65,22 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
 
 GType gtk_style_properties_get_type (void) G_GNUC_CONST;
 
-/* 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);