diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
| commit | 3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2 (patch) | |
| tree | 314c3099bcc57d9af09d249e1e7dd8e45baca642 /gtk2_ardour/gtk-custom-ruler.c | |
| parent | d15fda6d751a465d278f477923075d4783f3b1ca (diff) | |
| parent | 897fbdc652434d3aa1e67223c3c3ef7ae9be2318 (diff) | |
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
Diffstat (limited to 'gtk2_ardour/gtk-custom-ruler.c')
| -rw-r--r-- | gtk2_ardour/gtk-custom-ruler.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c index 797922f563..16097faa2e 100644 --- a/gtk2_ardour/gtk-custom-ruler.c +++ b/gtk2_ardour/gtk-custom-ruler.c @@ -98,7 +98,7 @@ GType gtk_custom_ruler_get_type (void) }; ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCustomRuler", - &ruler_info, 0); + &ruler_info, (GTypeFlags)0); } return ruler_type; @@ -198,9 +198,8 @@ gtk_custom_ruler_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - (void) pspec; - GtkCustomRuler *ruler = GTK_CUSTOM_RULER (object); + (void) pspec; switch (prop_id) { |