smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 04:36:30 +01:00
Code Issues Projects Releases Wiki Activity

'gtk2_ardour' - Some further casting

Browse source
This commit is contained in:
John Emmas 2013-10-06 10:50:45 +01:00
parent da628185b1
commit 7f4ed54f53
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/gtk-custom-hruler.c
View file

@ -64,7 +64,7 @@ GType gtk_custom_hruler_get_type (void)
}; };
hruler_type = g_type_register_static (gtk_custom_ruler_get_type(), "GtkCustomHRuler", hruler_type = g_type_register_static (gtk_custom_ruler_get_type(), "GtkCustomHRuler",
&hruler_info, 0); &hruler_info, (GTypeFlags)0);
} }
return hruler_type; return hruler_type;

2
gtk2_ardour/gtk-custom-ruler.c
View file

@ -98,7 +98,7 @@ GType gtk_custom_ruler_get_type (void)
}; };
ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCustomRuler", ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCustomRuler",
&ruler_info, 0); &ruler_info, (GTypeFlags)0);
} }
return ruler_type; return ruler_type;

12
gtk2_ardour/gtk_pianokeyboard.c
View file

@ -244,7 +244,7 @@ bind_key(PianoKeyboard *pk, const char *key, int note)
{ {
assert(pk->key_bindings != NULL); 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 static void
@ -610,15 +610,15 @@ piano_keyboard_class_init(PianoKeyboardClass *klass)
/* Set up signals. */ /* Set up signals. */
piano_keyboard_signals[NOTE_ON_SIGNAL] = g_signal_new ("note-on", 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); 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", 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); 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
piano_keyboard_signals[REST_SIGNAL] = g_signal_new ("rest", 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); 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
widget_klass = (GtkWidgetClass*) klass; widget_klass = (GtkWidgetClass*) klass;
@ -659,7 +659,7 @@ piano_keyboard_get_type(void)
0, /* value_table */ 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; return mk_type;
@ -668,7 +668,7 @@ piano_keyboard_get_type(void)
GtkWidget * GtkWidget *
piano_keyboard_new(void) 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); PianoKeyboard *pk = PIANO_KEYBOARD(widget);