X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssstylepropertyprivate.h;h=fb851899ebe32c27c1011e2baf54a4802bdd8392;hb=3c04597306a918317cb96d6c267fc73a798c04e4;hp=d207595b3484785c306015fe19d84506855cb50d;hpb=a81ac3d5cd71fedef35bf861e4232f2dee3e0a21;p=~andy%2Fgtk

diff --git a/gtk/gtkcssstylepropertyprivate.h b/gtk/gtkcssstylepropertyprivate.h
index d207595b3..fb851899e 100644
--- a/gtk/gtkcssstylepropertyprivate.h
+++ b/gtk/gtkcssstylepropertyprivate.h
@@ -12,8 +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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Benjamin Otte <otte@gnome.org>
  */
@@ -35,29 +34,27 @@ G_BEGIN_DECLS
 typedef struct _GtkCssStyleProperty           GtkCssStyleProperty;
 typedef struct _GtkCssStylePropertyClass      GtkCssStylePropertyClass;
 
-typedef gboolean         (* GtkCssStylePropertyParseFunc)  (GtkCssStyleProperty    *property,
-                                                            GValue                 *value,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
-typedef void             (* GtkCssStylePropertyPrintFunc)  (GtkCssStyleProperty    *property,
-                                                            const GValue           *value,
-                                                            GString                *string);
-typedef void             (* GtkCssStylePropertyComputeFunc)(GtkCssStyleProperty    *property,
-                                                            GValue                 *computed,
-                                                            GtkStyleContext        *context,
-                                                            const GValue           *specified);
+typedef GtkCssValue *    (* GtkCssStylePropertyParseFunc)  (GtkCssStyleProperty    *property,
+                                                            GtkCssParser           *parser);
+typedef void             (* GtkCssStylePropertyQueryFunc)  (GtkCssStyleProperty    *property,
+                                                            const GtkCssValue      *cssvalue,
+                                                            GValue                 *value);
+typedef GtkCssValue *    (* GtkCssStylePropertyAssignFunc) (GtkCssStyleProperty    *property,
+                                                            const GValue           *value);
 struct _GtkCssStyleProperty
 {
   GtkStyleProperty parent;
 
-  GType computed_type;
-  GValue initial_value;
+  GtkCssValue *initial_value;
   guint id;
   guint inherit :1;
+  guint animated :1;
+  guint affects_size :1;
+  guint affects_font :1;
 
   GtkCssStylePropertyParseFunc parse_value;
-  GtkCssStylePropertyPrintFunc print_value;
-  GtkCssStylePropertyComputeFunc compute_value;
+  GtkCssStylePropertyQueryFunc query_value;
+  GtkCssStylePropertyAssignFunc assign_value;
 };
 
 struct _GtkCssStylePropertyClass
@@ -75,23 +72,21 @@ guint                   _gtk_css_style_property_get_n_properties(void);
 GtkCssStyleProperty *   _gtk_css_style_property_lookup_by_id    (guint                   id);
 
 gboolean                _gtk_css_style_property_is_inherit      (GtkCssStyleProperty    *property);
+gboolean                _gtk_css_style_property_is_animated     (GtkCssStyleProperty    *property);
+gboolean                _gtk_css_style_property_affects_size    (GtkCssStyleProperty    *property);
+gboolean                _gtk_css_style_property_affects_font    (GtkCssStyleProperty    *property);
 guint                   _gtk_css_style_property_get_id          (GtkCssStyleProperty    *property);
-const GValue *          _gtk_css_style_property_get_initial_value
+GtkCssValue  *          _gtk_css_style_property_get_initial_value
                                                                 (GtkCssStyleProperty    *property);
-GType                   _gtk_css_style_property_get_computed_type (GtkCssStyleProperty *property);
-GType                   _gtk_css_style_property_get_specified_type (GtkCssStyleProperty *property);
-gboolean                _gtk_css_style_property_is_specified_type (GtkCssStyleProperty  *property,
-                                                                 GType                   type);
-
-void                    _gtk_css_style_property_compute_value   (GtkCssStyleProperty    *property,
-                                                                 GValue                 *computed,
-                                                                 GtkStyleContext        *context,
-                                                                 const GValue           *specified);
 
 void                    _gtk_css_style_property_print_value     (GtkCssStyleProperty    *property,
-                                                                 const GValue           *value,
+                                                                 GtkCssValue            *value,
                                                                  GString                *string);
-                                                                 
+
+gboolean                _gtk_css_style_property_changes_affect_size
+                                                                (const GtkBitmask       *changes);
+gboolean                _gtk_css_style_property_changes_affect_font
+                                                                (const GtkBitmask       *changes);
 
 G_END_DECLS