From 7f4ed54f537ae606af7af12626674c668f62738d Mon Sep 17 00:00:00 2001 From: John Emmas Date: Sun, 6 Oct 2013 10:50:45 +0100 Subject: 'gtk2_ardour' - Some further casting --- gtk2_ardour/gtk-custom-hruler.c | 2 +- gtk2_ardour/gtk-custom-ruler.c | 2 +- gtk2_ardour/gtk_pianokeyboard.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c index a3745ba691..5f17ffe583 100644 --- a/gtk2_ardour/gtk-custom-hruler.c +++ b/gtk2_ardour/gtk-custom-hruler.c @@ -64,7 +64,7 @@ GType gtk_custom_hruler_get_type (void) }; hruler_type = g_type_register_static (gtk_custom_ruler_get_type(), "GtkCustomHRuler", - &hruler_info, 0); + &hruler_info, (GTypeFlags)0); } return hruler_type; diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c index 9858a06568..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; diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 5101bd8aff..71bef141ca 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -244,7 +244,7 @@ bind_key(PianoKeyboard *pk, const char *key, int note) { assert(pk->key_bindings != NULL); - g_hash_table_insert(pk->key_bindings, key, (gpointer)((intptr_t)note)); + g_hash_table_insert(pk->key_bindings, (const gpointer)key, (gpointer)((intptr_t)note)); } static void @@ -610,15 +610,15 @@ piano_keyboard_class_init(PianoKeyboardClass *klass) /* Set up signals. */ piano_keyboard_signals[NOTE_ON_SIGNAL] = g_signal_new ("note-on", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_TYPE_FROM_CLASS (klass), (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION), 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); piano_keyboard_signals[NOTE_OFF_SIGNAL] = g_signal_new ("note-off", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_TYPE_FROM_CLASS (klass), (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION), 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); piano_keyboard_signals[REST_SIGNAL] = g_signal_new ("rest", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_TYPE_FROM_CLASS (klass), (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION), 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_klass = (GtkWidgetClass*) klass; @@ -659,7 +659,7 @@ piano_keyboard_get_type(void) 0, /* value_table */ }; - mk_type = g_type_register_static(GTK_TYPE_DRAWING_AREA, "PianoKeyboard", &mk_info, 0); + mk_type = g_type_register_static(GTK_TYPE_DRAWING_AREA, "PianoKeyboard", &mk_info, (GTypeFlags)0); } return mk_type; @@ -668,7 +668,7 @@ piano_keyboard_get_type(void) GtkWidget * piano_keyboard_new(void) { - GtkWidget *widget = gtk_type_new(piano_keyboard_get_type()); + GtkWidget *widget = (GtkWidget*)gtk_type_new(piano_keyboard_get_type()); PianoKeyboard *pk = PIANO_KEYBOARD(widget); -- cgit v1.2.3