← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gtk+3.0/trusty

« back to all changes in this revision

Viewing changes to gtk/gtkcssstylepropertyprivate.h

  • Committer: Package Import Robot
  • Author(s): Robert Ancell, Jeremy Bicha, Robert Ancell, Sebastien Bacher, Ken VanDine
  • Date: 2012-06-15 11:36:11 UTC
  • mfrom: (1.1.20) (36.1.48 precise) (0.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20120615113611-bvb6nfn0k6kriz3k
Tags: 3.5.4-0ubuntu1
https://launchpad.net/bugs/986969
https://launchpad.net/bugs/1000545
https://launchpad.net/bugs/1001229
[ Jeremy Bicha ]
* settings.ini:
  Set gnome-panel menu-bar icon size to 24 so that Ubuntu logo
  for the Applications menu isn't set too small (LP: #986969)

[ Robert Ancell ]
* New upstream release (LP: #1000545)
* debian/control:
  - Bump build-depends on libglib2.0-dev
  - Add breaks older version of gtk3-engines-unico
* debian/libgtk-3-0.symbols:
  - Updated
* debian/libgtk-3-0.install.in:
* debian/rules:
  - Install settings.ini in rules
* debian/patches/00git_gtkimage_cleanup_crash.patch:
  - Applied upstream

[ Sebastien Bacher ]
* Rebase on Debian, including:
  - simplified the build rules and .install
  - dropped the static build (not really useful and costing time and efforts)
* Remaining diffs:
* debian/control.in:
  - updated replace versions
* debian/patches/100_overlay_scrollbar_loading.patch: 
  -dropped, the new scollbar code doesn't require that hack
* Drop fallback support for pre-multiarch loaders
* Remaining patches:
  - 043_ubuntu_menu_proxy.patch
  - 062_ubuntu-set-grab-add.patch
  - 073_treeview_almost_fixed.patch
  - 075_expose_gdkwidget_for_gtkrange.patch
  - 099_eventbox_scroll_mask.patch
  - git_gtkcellrenderer_grabbing_modifier.patch

[ Ken VanDine ]
* debian/patches/101_revert_symbolic_icon_search.patch
  - Revert symbolic icon search changes from 3.4.2, it breaks the icon 
    displayed in indicator-power because of the order the icons are searched
    in.  It looks like ubuntu-mono should drop the old icon names and 
    use the new -symbolic icons.  We need to carry this patch until 
    ubuntu-mono fixes it's handling of symbolic icons.  (LP: #1001229)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/gtkcssstylepropertyprivate.h
34
34
typedef struct _GtkCssStyleProperty           GtkCssStyleProperty;
35
35
typedef struct _GtkCssStylePropertyClass      GtkCssStylePropertyClass;
36
36
 
37
 
typedef gboolean         (* GtkCssStylePropertyParseFunc)  (GtkCssStyleProperty    *property,
38
 
                                                            GValue                 *value,
39
 
                                                            GtkCssParser           *parser,
40
 
                                                            GFile                  *base);
 
37
typedef GtkCssValue *    (* GtkCssStylePropertyParseFunc)  (GtkCssStyleProperty    *property,
 
38
                                                            GtkCssParser           *parser);
41
39
typedef void             (* GtkCssStylePropertyPrintFunc)  (GtkCssStyleProperty    *property,
42
 
                                                            const GValue           *value,
 
40
                                                            const GtkCssValue      *value,
43
41
                                                            GString                *string);
44
42
typedef GtkCssValue  *   (* GtkCssStylePropertyComputeFunc)(GtkCssStyleProperty    *property,
45
43
                                                            GtkStyleContext        *context,
46
44
                                                            GtkCssValue            *specified);
 
45
typedef void             (* GtkCssStylePropertyQueryFunc)  (GtkCssStyleProperty    *property,
 
46
                                                            const GtkCssValue      *cssvalue,
 
47
                                                            GValue                 *value);
 
48
typedef GtkCssValue *    (* GtkCssStylePropertyAssignFunc) (GtkCssStyleProperty    *property,
 
49
                                                            const GValue           *value);
47
50
struct _GtkCssStyleProperty
48
51
{
49
52
  GtkStyleProperty parent;
50
53
 
51
 
  GType computed_type;
52
54
  GtkCssValue *initial_value;
53
55
  guint id;
54
56
  guint inherit :1;
 
57
  guint animated :1;
55
58
 
56
59
  GtkCssStylePropertyParseFunc parse_value;
57
60
  GtkCssStylePropertyPrintFunc print_value;
58
61
  GtkCssStylePropertyComputeFunc compute_value;
 
62
  GtkCssStylePropertyQueryFunc query_value;
 
63
  GtkCssStylePropertyAssignFunc assign_value;
59
64
};
60
65
 
61
66
struct _GtkCssStylePropertyClass
73
78
GtkCssStyleProperty *   _gtk_css_style_property_lookup_by_id    (guint                   id);
74
79
 
75
80
gboolean                _gtk_css_style_property_is_inherit      (GtkCssStyleProperty    *property);
 
81
gboolean                _gtk_css_style_property_is_animated     (GtkCssStyleProperty    *property);
76
82
guint                   _gtk_css_style_property_get_id          (GtkCssStyleProperty    *property);
77
83
GtkCssValue  *          _gtk_css_style_property_get_initial_value
78
84
                                                                (GtkCssStyleProperty    *property);
79
 
GType                   _gtk_css_style_property_get_computed_type (GtkCssStyleProperty *property);
80
 
GType                   _gtk_css_style_property_get_specified_type (GtkCssStyleProperty *property);
81
 
gboolean                _gtk_css_style_property_is_specified_type (GtkCssStyleProperty  *property,
82
 
                                                                 GType                   type);
83
85
 
84
86
GtkCssValue *           _gtk_css_style_property_compute_value   (GtkCssStyleProperty    *property,
85
87
                                                                 GtkStyleContext        *context,