X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstylepropertyprivate.h;h=a92afdc36a0783ce57968cdc0f5f7e17c2f3bb93;hb=aaedf5a35219b034a244730564b8fdf2b7d32540;hp=92cfb0761c5edbfa7379b7e9f89715251d5aa75a;hpb=c3d337312a65eb6dfa6c040c052a75a74227413d;p=~andy%2Fgtk

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 92cfb0761..a92afdc36 100644
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -12,9 +12,7 @@
  * 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_STYLEPROPERTY_PRIVATE_H__
@@ -22,6 +20,7 @@
 
 #include "gtkcssparserprivate.h"
 #include "gtkstylecontextprivate.h"
+#include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS
 
@@ -35,16 +34,8 @@ G_BEGIN_DECLS
 typedef struct _GtkStyleProperty           GtkStyleProperty;
 typedef struct _GtkStylePropertyClass      GtkStylePropertyClass;
 
-typedef enum {
-  GTK_STYLE_PROPERTY_INHERIT = (1 << 0)
-} GtkStylePropertyFlags;
-
-typedef GParameter *     (* GtkStyleUnpackFunc)            (const GValue           *value,
-                                                            guint                  *n_params);
-typedef void             (* GtkStylePackFunc)              (GValue                 *value,
-                                                            GtkStyleProperties     *props,
-                                                            GtkStateFlags           state,
-							    GtkStylePropertyContext *context);
+typedef GtkCssValue *   (* GtkStyleQueryFunc)        (guint                   id,
+						      gpointer                data);
 
 struct _GtkStyleProperty
 {
@@ -52,9 +43,6 @@ struct _GtkStyleProperty
 
   char *name;
   GType value_type;
-
-  GtkStyleUnpackFunc        unpack_func;
-  GtkStylePackFunc          pack_func;
 };
 
 struct _GtkStylePropertyClass
@@ -66,35 +54,31 @@ struct _GtkStylePropertyClass
                                                             GtkStateFlags           state,
                                                             const GValue           *value);
   void              (* query)                              (GtkStyleProperty       *property,
-                                                            GtkStyleProperties     *props,
-                                                            GtkStateFlags           state,
-			                                    GtkStylePropertyContext *context,
-                                                            GValue                 *value);
-  gboolean          (* parse_value)                        (GtkStyleProperty *      property,
                                                             GValue                 *value,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+                                                            GtkStyleQueryFunc       query_func,
+                                                            gpointer                query_data);
+  GtkCssValue *     (* parse_value)                        (GtkStyleProperty *      property,
+                                                            GtkCssParser           *parser);
 
   GHashTable   *properties;
 };
 
 GType               _gtk_style_property_get_type             (void) G_GNUC_CONST;
 
+void                _gtk_style_property_init_properties      (void);
+
 GtkStyleProperty *       _gtk_style_property_lookup        (const char             *name);
 
 const char *             _gtk_style_property_get_name      (GtkStyleProperty       *property);
 
-gboolean                 _gtk_style_property_parse_value   (GtkStyleProperty *      property,
-                                                            GValue                 *value,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+GtkCssValue *            _gtk_style_property_parse_value   (GtkStyleProperty *      property,
+                                                            GtkCssParser           *parser);
 
 GType                    _gtk_style_property_get_value_type(GtkStyleProperty *      property);
 void                     _gtk_style_property_query         (GtkStyleProperty *      property,
-                                                            GtkStyleProperties     *props,
-                                                            GtkStateFlags           state,
-							    GtkStylePropertyContext *context,
-                                                            GValue                 *value);
+                                                            GValue                 *value,
+                                                            GtkStyleQueryFunc       query_func,
+                                                            gpointer                query_data);
 void                     _gtk_style_property_assign        (GtkStyleProperty       *property,
                                                             GtkStyleProperties     *props,
                                                             GtkStateFlags           state,