Mercurial > audlegacy-plugins
changeset 3017:963796db51ea
Don't use deprecated gtk macros and types
line wrap: on
line diff
--- a/src/skins/ui_dock.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_dock.c Thu Apr 09 14:23:42 2009 +0200 @@ -428,19 +428,19 @@ gtk_window_present(w); mx = event->x; my = event->y; - gtk_object_set_data(GTK_OBJECT(w), "move_offset_x", GINT_TO_POINTER(mx)); - gtk_object_set_data(GTK_OBJECT(w), "move_offset_y", GINT_TO_POINTER(my)); + g_object_set_data(G_OBJECT(w), "move_offset_x", GINT_TO_POINTER(mx)); + g_object_set_data(G_OBJECT(w), "move_offset_y", GINT_TO_POINTER(my)); if (move_list) - gtk_object_set_data(GTK_OBJECT(w), "docked_list", - get_docked_list(NULL, window_list, w, 0, 0)); + g_object_set_data(G_OBJECT(w), "docked_list", + get_docked_list(NULL, window_list, w, 0, 0)); else { dwin = g_new0(DockedWindow, 1); dwin->w = w; - gtk_object_set_data(GTK_OBJECT(w), "docked_list", - g_list_append(NULL, dwin)); + g_object_set_data(G_OBJECT(w), "docked_list", + g_list_append(NULL, dwin)); } - gtk_object_set_data(GTK_OBJECT(w), "window_list", window_list); - gtk_object_set_data(GTK_OBJECT(w), "is_moving", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(w), "window_list", window_list); + g_object_set_data(G_OBJECT(w), "is_moving", GINT_TO_POINTER(1)); } void @@ -450,15 +450,15 @@ GList *dlist; GList *window_list; - if (!gtk_object_get_data(GTK_OBJECT(w), "is_moving")) + if (!g_object_get_data(G_OBJECT(w), "is_moving")) return; offset_x = - GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), "move_offset_x")); + GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "move_offset_x")); offset_y = - GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), "move_offset_y")); - dlist = gtk_object_get_data(GTK_OBJECT(w), "docked_list"); - window_list = gtk_object_get_data(GTK_OBJECT(w), "window_list"); + GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "move_offset_y")); + dlist = g_object_get_data(G_OBJECT(w), "docked_list"); + window_list = g_object_get_data(G_OBJECT(w), "window_list"); x = event->x_root - offset_x; y = event->y_root - offset_y; @@ -474,19 +474,19 @@ dock_move_release(GtkWindow * w) { GList *dlist; - gtk_object_remove_data(GTK_OBJECT(w), "is_moving"); - gtk_object_remove_data(GTK_OBJECT(w), "move_offset_x"); - gtk_object_remove_data(GTK_OBJECT(w), "move_offset_y"); - if ((dlist = gtk_object_get_data(GTK_OBJECT(w), "docked_list")) != NULL) + g_object_set_data(G_OBJECT(w), "is_moving", NULL); + g_object_set_data(G_OBJECT(w), "move_offset_x", NULL); + g_object_set_data(G_OBJECT(w), "move_offset_y", NULL); + if ((dlist = g_object_get_data(G_OBJECT(w), "docked_list")) != NULL) free_docked_list(dlist); - gtk_object_remove_data(GTK_OBJECT(w), "docked_list"); - gtk_object_remove_data(GTK_OBJECT(w), "window_list"); + g_object_set_data(G_OBJECT(w), "docked_list", NULL); + g_object_set_data(G_OBJECT(w), "window_list", NULL); } gboolean dock_is_moving(GtkWindow * w) { - if (gtk_object_get_data(GTK_OBJECT(w), "is_moving")) + if (g_object_get_data(G_OBJECT(w), "is_moving")) return TRUE; return FALSE; }
--- a/src/skins/ui_equalizer.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_equalizer.c Thu Apr 09 14:23:42 2009 +0200 @@ -991,7 +991,7 @@ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); + gtk_box_set_spacing(GTK_BOX(bbox), 5); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); button_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
--- a/src/skins/ui_main.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_main.c Thu Apr 09 14:23:42 2009 +0200 @@ -937,7 +937,7 @@ g_signal_connect(mainwin_jtt, "destroy", G_CALLBACK(gtk_widget_destroyed), &mainwin_jtt); - gtk_container_border_width(GTK_CONTAINER(mainwin_jtt), 10); + gtk_container_set_border_width(GTK_CONTAINER(mainwin_jtt), 10); vbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(mainwin_jtt), vbox); @@ -973,7 +973,7 @@ bbox = gtk_hbutton_box_new(); gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 0); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); + gtk_box_set_spacing(GTK_BOX(bbox), 5); cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT); @@ -992,7 +992,7 @@ tindex % 60); gtk_entry_set_text(GTK_ENTRY(time_entry), time_str); - gtk_entry_select_region(GTK_ENTRY(time_entry), 0, strlen(time_str)); + gtk_editable_select_region(GTK_EDITABLE(time_entry), 0, strlen(time_str)); gtk_widget_show_all(mainwin_jtt);
--- a/src/skins/ui_playlist_manager.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_playlist_manager.c Thu Apr 09 14:23:42 2009 +0200 @@ -437,7 +437,7 @@ /* button bar */ playman_bbar_hbbox = gtk_hbutton_box_new(); gtk_button_box_set_layout( GTK_BUTTON_BOX(playman_bbar_hbbox) , GTK_BUTTONBOX_END ); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(playman_bbar_hbbox), 5); + gtk_box_set_spacing(GTK_BOX(playman_bbar_hbbox), 5); playman_bbar_bt_close = gtk_button_new_from_stock( GTK_STOCK_CLOSE ); playman_bbar_bt_del = gtk_button_new_from_stock( GTK_STOCK_DELETE ); playman_bbar_bt_new = gtk_button_new_from_stock( GTK_STOCK_NEW );
--- a/src/skins/ui_skinned_button.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_button.c Thu Apr 09 14:23:42 2009 +0200 @@ -130,22 +130,22 @@ button_signals[PRESSED] = g_signal_new ("pressed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (UiSkinnedButtonClass, pressed), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); button_signals[RELEASED] = g_signal_new ("released", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (UiSkinnedButtonClass, released), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); button_signals[CLICKED] = g_signal_new ("clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedButtonClass, clicked), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); button_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedButtonClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_type_class_add_private (gobject_class, sizeof (UiSkinnedButtonPrivate)); }
--- a/src/skins/ui_skinned_equalizer_graph.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_equalizer_graph.c Thu Apr 09 14:23:42 2009 +0200 @@ -87,7 +87,7 @@ equalizer_graph_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedEqualizerGraphClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } static void ui_skinned_equalizer_graph_init(UiSkinnedEqualizerGraph *equalizer_graph) {
--- a/src/skins/ui_skinned_equalizer_graph.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_equalizer_graph.h Thu Apr 09 14:23:42 2009 +0200 @@ -36,9 +36,9 @@ #define EQUALIZER_MAX_GAIN 12.0 -#define UI_SKINNED_EQUALIZER_GRAPH(obj) GTK_CHECK_CAST (obj, ui_skinned_equalizer_graph_get_type (), UiSkinnedEqualizerGraph) -#define UI_SKINNED_EQUALIZER_GRAPH_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_equalizer_graph_get_type (), UiSkinnedEqualizerGraphClass) -#define UI_SKINNED_IS_EQUALIZER_GRAPH(obj) GTK_CHECK_TYPE (obj, ui_skinned_equalizer_graph_get_type ()) +#define UI_SKINNED_EQUALIZER_GRAPH(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_equalizer_graph_get_type (), UiSkinnedEqualizerGraph) +#define UI_SKINNED_EQUALIZER_GRAPH_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_equalizer_graph_get_type (), UiSkinnedEqualizerGraphClass) +#define UI_SKINNED_IS_EQUALIZER_GRAPH(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_equalizer_graph_get_type ()) typedef struct _UiSkinnedEqualizerGraph UiSkinnedEqualizerGraph; typedef struct _UiSkinnedEqualizerGraphClass UiSkinnedEqualizerGraphClass;
--- a/src/skins/ui_skinned_equalizer_slider.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_equalizer_slider.c Thu Apr 09 14:23:42 2009 +0200 @@ -116,7 +116,7 @@ equalizer_slider_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedEqualizerSliderClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_type_class_add_private (gobject_class, sizeof (UiSkinnedEqualizerSliderPrivate)); }
--- a/src/skins/ui_skinned_equalizer_slider.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_equalizer_slider.h Thu Apr 09 14:23:42 2009 +0200 @@ -33,9 +33,9 @@ #define EQUALIZER_MAX_GAIN 12.0 -#define UI_SKINNED_EQUALIZER_SLIDER(obj) GTK_CHECK_CAST (obj, ui_skinned_equalizer_slider_get_type (), UiSkinnedEqualizerSlider) -#define UI_SKINNED_EQUALIZER_SLIDER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_equalizer_slider_get_type (), UiSkinnedEqualizerSliderClass) -#define UI_SKINNED_IS_EQUALIZER_SLIDER(obj) GTK_CHECK_TYPE (obj, ui_skinned_equalizer_slider_get_type ()) +#define UI_SKINNED_EQUALIZER_SLIDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_equalizer_slider_get_type (), UiSkinnedEqualizerSlider) +#define UI_SKINNED_EQUALIZER_SLIDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_equalizer_slider_get_type (), UiSkinnedEqualizerSliderClass) +#define UI_SKINNED_IS_EQUALIZER_SLIDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_equalizer_slider_get_type ()) typedef struct _UiSkinnedEqualizerSlider UiSkinnedEqualizerSlider; typedef struct _UiSkinnedEqualizerSliderClass UiSkinnedEqualizerSliderClass; @@ -52,7 +52,7 @@ }; GtkWidget* ui_skinned_equalizer_slider_new(GtkWidget *fixed, gint x, gint y); -GtkType ui_skinned_equalizer_slider_get_type(void); +GType ui_skinned_equalizer_slider_get_type(void); void ui_skinned_equalizer_slider_set_position(GtkWidget *widget, gfloat pos); gfloat ui_skinned_equalizer_slider_get_position(GtkWidget *widget);
--- a/src/skins/ui_skinned_horizontal_slider.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_horizontal_slider.c Thu Apr 09 14:23:42 2009 +0200 @@ -116,17 +116,17 @@ horizontal_slider_signals[MOTION] = g_signal_new ("motion", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedHorizontalSliderClass, motion), NULL, NULL, - gtk_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); horizontal_slider_signals[RELEASE] = g_signal_new ("release", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedHorizontalSliderClass, release), NULL, NULL, - gtk_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); horizontal_slider_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedHorizontalSliderClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_type_class_add_private (gobject_class, sizeof (UiSkinnedHorizontalSliderPrivate)); }
--- a/src/skins/ui_skinned_horizontal_slider.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_horizontal_slider.h Thu Apr 09 14:23:42 2009 +0200 @@ -34,9 +34,9 @@ extern "C" { #endif -#define UI_SKINNED_HORIZONTAL_SLIDER(obj) GTK_CHECK_CAST (obj, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSlider) -#define UI_SKINNED_HORIZONTAL_SLIDER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSliderClass) -#define UI_SKINNED_IS_HORIZONTAL_SLIDER(obj) GTK_CHECK_TYPE (obj, ui_skinned_horizontal_slider_get_type ()) +#define UI_SKINNED_HORIZONTAL_SLIDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSlider) +#define UI_SKINNED_HORIZONTAL_SLIDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSliderClass) +#define UI_SKINNED_IS_HORIZONTAL_SLIDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_horizontal_slider_get_type ()) typedef struct _UiSkinnedHorizontalSlider UiSkinnedHorizontalSlider; typedef struct _UiSkinnedHorizontalSliderClass UiSkinnedHorizontalSliderClass; @@ -58,7 +58,7 @@ GtkWidget* ui_skinned_horizontal_slider_new(GtkWidget *fixed, gint x, gint y, gint w, gint h, gint knx, gint kny, gint kpx, gint kpy, gint kw, gint kh, gint fh, gint fo, gint min, gint max, gint(*fcb) (gint), SkinPixmapId si); -GtkType ui_skinned_horizontal_slider_get_type(void); +GType ui_skinned_horizontal_slider_get_type(void); void ui_skinned_horizontal_slider_set_position(GtkWidget *widget, gint pos); gint ui_skinned_horizontal_slider_get_position(GtkWidget *widget);
--- a/src/skins/ui_skinned_menurow.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_menurow.c Thu Apr 09 14:23:42 2009 +0200 @@ -104,13 +104,13 @@ menurow_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedMenurowClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); menurow_signals[CHANGE] = g_signal_new ("change", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedMenurowClass, change), NULL, NULL, - gtk_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); menurow_signals[RELEASE] = g_signal_new ("release", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--- a/src/skins/ui_skinned_menurow.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_menurow.h Thu Apr 09 14:23:42 2009 +0200 @@ -34,9 +34,9 @@ extern "C" { #endif -#define UI_SKINNED_MENUROW(obj) GTK_CHECK_CAST (obj, ui_skinned_menurow_get_type (), UiSkinnedMenurow) -#define UI_SKINNED_MENUROW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_menurow_get_type (), UiSkinnedMenurowClass) -#define UI_SKINNED_IS_MENUROW(obj) GTK_CHECK_TYPE (obj, ui_skinned_menurow_get_type ()) +#define UI_SKINNED_MENUROW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_menurow_get_type (), UiSkinnedMenurow) +#define UI_SKINNED_MENUROW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_menurow_get_type (), UiSkinnedMenurowClass) +#define UI_SKINNED_IS_MENUROW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_menurow_get_type ()) typedef struct _UiSkinnedMenurow UiSkinnedMenurow; typedef struct _UiSkinnedMenurowClass UiSkinnedMenurowClass; @@ -69,7 +69,7 @@ }; GtkWidget* ui_skinned_menurow_new (GtkWidget *fixed, gint x, gint y, gint nx, gint ny, gint sx, gint sy, SkinPixmapId si); -GtkType ui_skinned_menurow_get_type(void); +GType ui_skinned_menurow_get_type(void); #ifdef __cplusplus }
--- a/src/skins/ui_skinned_monostereo.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_monostereo.c Thu Apr 09 14:23:42 2009 +0200 @@ -87,7 +87,7 @@ monostereo_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedMonoStereoClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } static void ui_skinned_monostereo_init(UiSkinnedMonoStereo *monostereo) {
--- a/src/skins/ui_skinned_monostereo.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_monostereo.h Thu Apr 09 14:23:42 2009 +0200 @@ -34,9 +34,9 @@ extern "C" { #endif -#define UI_SKINNED_MONOSTEREO(obj) GTK_CHECK_CAST (obj, ui_skinned_monostereo_get_type (), UiSkinnedMonoStereo) -#define UI_SKINNED_MONOSTEREO_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_monostereo_get_type (), UiSkinnedMonoStereoClass) -#define UI_SKINNED_IS_MONOSTEREO(obj) GTK_CHECK_TYPE (obj, ui_skinned_monostereo_get_type ()) +#define UI_SKINNED_MONOSTEREO(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_monostereo_get_type (), UiSkinnedMonoStereo) +#define UI_SKINNED_MONOSTEREO_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_monostereo_get_type (), UiSkinnedMonoStereoClass) +#define UI_SKINNED_IS_MONOSTEREO(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_monostereo_get_type ()) typedef struct _UiSkinnedMonoStereo UiSkinnedMonoStereo; typedef struct _UiSkinnedMonoStereoClass UiSkinnedMonoStereoClass; @@ -56,7 +56,7 @@ }; GtkWidget* ui_skinned_monostereo_new (GtkWidget *fixed, gint x, gint y, SkinPixmapId si); -GtkType ui_skinned_monostereo_get_type(void); +GType ui_skinned_monostereo_get_type(void); void ui_skinned_monostereo_set_num_channels(GtkWidget *widget, gint nch); #ifdef __cplusplus
--- a/src/skins/ui_skinned_number.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_number.c Thu Apr 09 14:23:42 2009 +0200 @@ -97,7 +97,7 @@ number_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedNumberClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } static void ui_skinned_number_init(UiSkinnedNumber *number) {
--- a/src/skins/ui_skinned_number.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_number.h Thu Apr 09 14:23:42 2009 +0200 @@ -28,9 +28,9 @@ extern "C" { #endif -#define UI_SKINNED_NUMBER(obj) GTK_CHECK_CAST (obj, ui_skinned_number_get_type (), UiSkinnedNumber) -#define UI_SKINNED_NUMBER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_number_get_type (), UiSkinnedNumberClass) -#define UI_SKINNED_IS_NUMBER(obj) GTK_CHECK_TYPE (obj, ui_skinned_number_get_type ()) +#define UI_SKINNED_NUMBER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_number_get_type (), UiSkinnedNumber) +#define UI_SKINNED_NUMBER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_number_get_type (), UiSkinnedNumberClass) +#define UI_SKINNED_IS_NUMBER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_number_get_type ()) typedef struct _UiSkinnedNumber UiSkinnedNumber; typedef struct _UiSkinnedNumberClass UiSkinnedNumberClass; @@ -51,7 +51,7 @@ }; GtkWidget* ui_skinned_number_new (GtkWidget *fixed, gint x, gint y, SkinPixmapId si); -GtkType ui_skinned_number_get_type(void); +GType ui_skinned_number_get_type(void); void ui_skinned_number_set_number(GtkWidget *widget, gint num); void ui_skinned_number_set_size(GtkWidget *widget, gint width, gint height);
--- a/src/skins/ui_skinned_playlist.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_playlist.h Thu Apr 09 14:23:42 2009 +0200 @@ -38,9 +38,9 @@ extern "C" { #endif -#define UI_SKINNED_PLAYLIST(obj) GTK_CHECK_CAST (obj, ui_skinned_playlist_get_type (), UiSkinnedPlaylist) -#define UI_SKINNED_PLAYLIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_playlist_get_type (), UiSkinnedPlaylistClass) -#define UI_SKINNED_IS_PLAYLIST(obj) GTK_CHECK_TYPE (obj, ui_skinned_playlist_get_type ()) +#define UI_SKINNED_PLAYLIST(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_playlist_get_type (), UiSkinnedPlaylist) +#define UI_SKINNED_PLAYLIST_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_playlist_get_type (), UiSkinnedPlaylistClass) +#define UI_SKINNED_IS_PLAYLIST(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_playlist_get_type ()) typedef struct _UiSkinnedPlaylist UiSkinnedPlaylist; typedef struct _UiSkinnedPlaylistClass UiSkinnedPlaylistClass; @@ -62,7 +62,7 @@ }; GtkWidget* ui_skinned_playlist_new(GtkWidget *fixed, gint x, gint y, gint w, gint h); -GtkType ui_skinned_playlist_get_type(void); +GType ui_skinned_playlist_get_type(void); void ui_skinned_playlist_resize_relative(GtkWidget *widget, gint w, gint h); void ui_skinned_playlist_set_font(const gchar * font); void ui_skinned_playlist_move_up(UiSkinnedPlaylist *pl);
--- a/src/skins/ui_skinned_playlist_slider.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_playlist_slider.h Thu Apr 09 14:23:42 2009 +0200 @@ -33,9 +33,9 @@ extern "C" { #endif -#define UI_SKINNED_PLAYLIST_SLIDER(obj) GTK_CHECK_CAST (obj, ui_skinned_playlist_slider_get_type (), UiSkinnedPlaylistSlider) -#define UI_SKINNED_PLAYLIST_SLIDER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_playlist_slider_get_type (), UiSkinnedPlaylistSliderClass) -#define UI_SKINNED_IS_PLAYLIST_SLIDER(obj) GTK_CHECK_TYPE (obj, ui_skinned_playlist_slider_get_type ()) +#define UI_SKINNED_PLAYLIST_SLIDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_playlist_slider_get_type (), UiSkinnedPlaylistSlider) +#define UI_SKINNED_PLAYLIST_SLIDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_playlist_slider_get_type (), UiSkinnedPlaylistSliderClass) +#define UI_SKINNED_IS_PLAYLIST_SLIDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_playlist_slider_get_type ()) typedef struct _UiSkinnedPlaylistSlider UiSkinnedPlaylistSlider; typedef struct _UiSkinnedPlaylistSliderClass UiSkinnedPlaylistSliderClass; @@ -51,7 +51,7 @@ }; GtkWidget* ui_skinned_playlist_slider_new(GtkWidget *fixed, gint x, gint y, gint h); -GtkType ui_skinned_playlist_slider_get_type(void); +GType ui_skinned_playlist_slider_get_type(void); void ui_skinned_playlist_slider_move_relative(GtkWidget *widget, gint x); void ui_skinned_playlist_slider_resize_relative(GtkWidget *widget, gint h);
--- a/src/skins/ui_skinned_playstatus.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_playstatus.c Thu Apr 09 14:23:42 2009 +0200 @@ -89,7 +89,7 @@ playstatus_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedPlaystatusClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } static void ui_skinned_playstatus_init(UiSkinnedPlaystatus *playstatus) {
--- a/src/skins/ui_skinned_playstatus.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_playstatus.h Thu Apr 09 14:23:42 2009 +0200 @@ -33,9 +33,9 @@ extern "C" { #endif -#define UI_SKINNED_PLAYSTATUS(obj) GTK_CHECK_CAST (obj, ui_skinned_playstatus_get_type (), UiSkinnedPlaystatus) -#define UI_SKINNED_PLAYSTATUS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_playstatus_get_type (), UiSkinnedPlaystatusClass) -#define UI_SKINNED_IS_PLAYSTATUS(obj) GTK_CHECK_TYPE (obj, ui_skinned_playstatus_get_type ()) +#define UI_SKINNED_PLAYSTATUS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_playstatus_get_type (), UiSkinnedPlaystatus) +#define UI_SKINNED_PLAYSTATUS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_playstatus_get_type (), UiSkinnedPlaystatusClass) +#define UI_SKINNED_IS_PLAYSTATUS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_playstatus_get_type ()) typedef struct _UiSkinnedPlaystatus UiSkinnedPlaystatus; typedef struct _UiSkinnedPlaystatusClass UiSkinnedPlaystatusClass; @@ -59,7 +59,7 @@ }; GtkWidget* ui_skinned_playstatus_new (GtkWidget *fixed, gint x, gint y); -GtkType ui_skinned_playstatus_get_type(void); +GType ui_skinned_playstatus_get_type(void); void ui_skinned_playstatus_set_status(GtkWidget *widget, PStatus status); void ui_skinned_playstatus_set_buffering(GtkWidget *widget, gboolean status); void ui_skinned_playstatus_set_size(GtkWidget *widget, gint width, gint height);
--- a/src/skins/ui_skinned_textbox.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_textbox.c Thu Apr 09 14:23:42 2009 +0200 @@ -139,22 +139,22 @@ textbox_signals[CLICKED] = g_signal_new ("clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedTextboxClass, clicked), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); textbox_signals[DOUBLE_CLICKED] = g_signal_new ("double-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedTextboxClass, double_clicked), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); textbox_signals[RIGHT_CLICKED] = g_signal_new ("right-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedTextboxClass, right_clicked), NULL, NULL, - gtk_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); textbox_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedTextboxClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_type_class_add_private (gobject_class, sizeof (UiSkinnedTextboxPrivate)); }
--- a/src/skins/ui_skinned_textbox.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_textbox.h Thu Apr 09 14:23:42 2009 +0200 @@ -34,9 +34,9 @@ extern "C" { #endif -#define UI_SKINNED_TEXTBOX(obj) GTK_CHECK_CAST (obj, ui_skinned_textbox_get_type (), UiSkinnedTextbox) -#define UI_SKINNED_TEXTBOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_textbox_get_type (), UiSkinnedTextboxClass) -#define UI_SKINNED_IS_TEXTBOX(obj) GTK_CHECK_TYPE (obj, ui_skinned_textbox_get_type ()) +#define UI_SKINNED_TEXTBOX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_textbox_get_type (), UiSkinnedTextbox) +#define UI_SKINNED_TEXTBOX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_textbox_get_type (), UiSkinnedTextboxClass) +#define UI_SKINNED_IS_TEXTBOX(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_textbox_get_type ()) typedef struct _UiSkinnedTextbox UiSkinnedTextbox; typedef struct _UiSkinnedTextboxClass UiSkinnedTextboxClass; @@ -58,7 +58,7 @@ }; GtkWidget* ui_skinned_textbox_new (GtkWidget *fixed, gint x, gint y, gint w, gboolean allow_scroll, SkinPixmapId si); -GtkType ui_skinned_textbox_get_type(void); +GType ui_skinned_textbox_get_type(void); void ui_skinned_textbox_set_xfont(GtkWidget *widget, gboolean use_xfont, const gchar * fontname); void ui_skinned_textbox_set_text(GtkWidget *widget, const gchar *text); void ui_skinned_textbox_set_scroll(GtkWidget *widget, gboolean scroll);
--- a/src/skins/ui_skinned_window.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_skinned_window.h Thu Apr 09 14:23:42 2009 +0200 @@ -21,9 +21,9 @@ #ifndef UI_SKINNED_WINDOW_H #define UI_SKINNED_WINDOW_H -#define SKINNED_WINDOW(obj) GTK_CHECK_CAST (obj, ui_skinned_window_get_type (), SkinnedWindow) -#define SKINNED_WINDOW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_skinned_window_get_type (), SkinnedWindowClass) -#define SKINNED_CHECK_WINDOW(obj) GTK_CHECK_TYPE (obj, ui_skinned_window_get_type ()) +#define SKINNED_WINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_window_get_type (), SkinnedWindow) +#define SKINNED_WINDOW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_window_get_type (), SkinnedWindowClass) +#define SKINNED_CHECK_WINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_window_get_type ()) #define SKINNED_TYPE_WINDOW (ui_skinned_window_get_type()) #ifdef GDK_WINDOWING_QUARTZ
--- a/src/skins/ui_svis.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_svis.c Thu Apr 09 14:23:42 2009 +0200 @@ -116,7 +116,7 @@ vis_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSVisClass, scaled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } static void ui_svis_init(UiSVis *svis) {
--- a/src/skins/ui_svis.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_svis.h Thu Apr 09 14:23:42 2009 +0200 @@ -27,9 +27,9 @@ extern "C" { #endif -#define UI_SVIS(obj) GTK_CHECK_CAST (obj, ui_svis_get_type (), UiSVis) -#define UI_SVIS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_svis_get_type (), UiSVisClass) -#define UI_IS_SVIS(obj) GTK_CHECK_TYPE (obj, ui_svis_get_type ()) +#define UI_SVIS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_svis_get_type (), UiSVis) +#define UI_SVIS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_svis_get_type (), UiSVisClass) +#define UI_IS_SVIS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_svis_get_type ()) typedef struct _UiSVis UiSVis; typedef struct _UiSVisClass UiSVisClass; @@ -52,7 +52,7 @@ }; GtkWidget* ui_svis_new (GtkWidget *fixed, gint x, gint y); -GtkType ui_svis_get_type(void); +GType ui_svis_get_type(void); void ui_svis_clear_data(GtkWidget *widget); void ui_svis_timeout_func(GtkWidget *widget, guchar * data); void ui_svis_set_visible(GtkWidget *widget, gboolean window_is_visible);
--- a/src/skins/ui_vis.c Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_vis.c Thu Apr 09 14:23:42 2009 +0200 @@ -100,7 +100,7 @@ vis_signals[DOUBLED] = g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiVisClass, doubled), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } static void ui_vis_init(UiVis *vis) {
--- a/src/skins/ui_vis.h Thu Apr 09 02:21:21 2009 +0300 +++ b/src/skins/ui_vis.h Thu Apr 09 14:23:42 2009 +0200 @@ -27,9 +27,9 @@ extern "C" { #endif -#define UI_VIS(obj) GTK_CHECK_CAST (obj, ui_vis_get_type (), UiVis) -#define UI_VIS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ui_vis_get_type (), UiVisClass) -#define UI_IS_VIS(obj) GTK_CHECK_TYPE (obj, ui_vis_get_type ()) +#define UI_VIS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_vis_get_type (), UiVis) +#define UI_VIS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_vis_get_type (), UiVisClass) +#define UI_IS_VIS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_vis_get_type ()) typedef enum { VIS_ANALYZER, VIS_SCOPE, VIS_VOICEPRINT, VIS_OFF @@ -85,7 +85,7 @@ }; GtkWidget* ui_vis_new (GtkWidget *fixed, gint x, gint y, gint width); -GtkType ui_vis_get_type(void); +GType ui_vis_get_type(void); void ui_vis_set_vis(GtkWidget *widget, gint num); void ui_vis_clear_data(GtkWidget *widget); void ui_vis_timeout_func(GtkWidget *widget, guchar * data);