diff -dPNur amide-0.9.1/src/amitk_canvas.h amide-0.9.1-new/src/amitk_canvas.h --- amide-0.9.1/src/amitk_canvas.h 2007-11-08 20:54:18.000000000 +0100 +++ amide-0.9.1-new/src/amitk_canvas.h 2009-06-20 02:03:43.000000000 +0200 @@ -36,10 +36,10 @@ G_BEGIN_DECLS #define AMITK_TYPE_CANVAS (amitk_canvas_get_type ()) -#define AMITK_CANVAS(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_CANVAS, AmitkCanvas)) -#define AMITK_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_CANVAS, AmitkCanvasClass)) -#define AMITK_IS_CANVAS(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_CANVAS)) -#define AMITK_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_CANVAS)) +#define AMITK_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_CANVAS, AmitkCanvas)) +#define AMITK_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_CANVAS, AmitkCanvasClass)) +#define AMITK_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_CANVAS)) +#define AMITK_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_CANVAS)) #define AMITK_CANVAS_VIEW(obj) (AMITK_CANVAS(obj)->view) #define AMITK_CANVAS_VIEW_MODE(obj) (AMITK_CANVAS(obj)->view_mode) diff -dPNur amide-0.9.1/src/amitk_color_table_menu.h amide-0.9.1-new/src/amitk_color_table_menu.h --- amide-0.9.1/src/amitk_color_table_menu.h 2007-11-03 04:08:01.000000000 +0100 +++ amide-0.9.1-new/src/amitk_color_table_menu.h 2009-06-20 01:46:03.000000000 +0200 @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define AMITK_TYPE_COLOR_TABLE_MENU (amitk_color_table_menu_get_type ()) -#define AMITK_COLOR_TABLE_MENU(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_COLOR_TABLE_MENU, AmitkColorTableMenu)) -#define AMITK_COLOR_TABLE_MENU_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_COLOR_TABLE_MENU, AmitkColorTableMenuClass)) -#define AMITK_IS_COLOR_TABLE_MENU(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_COLOR_TABLE_MENU)) -#define AMITK_IS_COLOR_TABLE_MENU_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_COLOR_TABLE_MENU)) +#define AMITK_COLOR_TABLE_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_COLOR_TABLE_MENU, AmitkColorTableMenu)) +#define AMITK_COLOR_TABLE_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_COLOR_TABLE_MENU, AmitkColorTableMenuClass)) +#define AMITK_IS_COLOR_TABLE_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_COLOR_TABLE_MENU)) +#define AMITK_IS_COLOR_TABLE_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_COLOR_TABLE_MENU)) #define AMITK_COLOR_TABLE_MENU_COLOR_TABLE(obj) (AMITK_COLOR_TABLE_MENU(obj)->color_table) typedef struct _AmitkColorTableMenu AmitkColorTableMenu; diff -dPNur amide-0.9.1/src/amitk_dial.c amide-0.9.1-new/src/amitk_dial.c --- amide-0.9.1/src/amitk_dial.c 2004-06-04 18:36:27.000000000 +0200 +++ amide-0.9.1-new/src/amitk_dial.c 2009-06-20 01:40:34.000000000 +0200 @@ -91,7 +91,7 @@ object_class = (GtkObjectClass*) class; widget_class = (GtkWidgetClass*) class; - parent_class = gtk_type_class (gtk_widget_get_type ()); + parent_class = g_type_class_ref (gtk_widget_get_type ()); object_class->destroy = amitk_dial_destroy; @@ -188,10 +188,10 @@ g_object_ref (G_OBJECT (dial->adjustment)); g_signal_connect (G_OBJECT (adjustment), "changed", - GTK_SIGNAL_FUNC (amitk_dial_adjustment_changed), + G_CALLBACK (amitk_dial_adjustment_changed), (gpointer) dial); g_signal_connect (G_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (amitk_dial_adjustment_value_changed), + G_CALLBACK (amitk_dial_adjustment_value_changed), (gpointer) dial); dial->old_value = adjustment->value; diff -dPNur amide-0.9.1/src/amitk_dial.h amide-0.9.1-new/src/amitk_dial.h --- amide-0.9.1/src/amitk_dial.h 2003-06-11 03:46:12.000000000 +0200 +++ amide-0.9.1-new/src/amitk_dial.h 2009-06-20 01:27:33.000000000 +0200 @@ -27,9 +27,9 @@ G_BEGIN_DECLS -#define AMITK_DIAL(obj) GTK_CHECK_CAST (obj, amitk_dial_get_type (), AmitkDial) -#define AMITK_DIAL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, amitk_dial_get_type (), AmitkDialClass) -#define AMITK_IS_DIAL(obj) GTK_CHECK_TYPE (obj, amitk_dial_get_type ()) +#define AMITK_DIAL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, amitk_dial_get_type (), AmitkDial) +#define AMITK_DIAL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, amitk_dial_get_type (), AmitkDialClass) +#define AMITK_IS_DIAL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, amitk_dial_get_type ()) typedef struct _AmitkDial AmitkDial; @@ -72,7 +72,7 @@ GtkWidget* amitk_dial_new (GtkAdjustment *adjustment); -GtkType amitk_dial_get_type (void); +GType amitk_dial_get_type (void); GtkAdjustment* amitk_dial_get_adjustment (AmitkDial *dial); void amitk_dial_set_update_policy (AmitkDial *dial, GtkUpdateType policy); diff -dPNur amide-0.9.1/src/amitk_object_dialog.h amide-0.9.1-new/src/amitk_object_dialog.h --- amide-0.9.1/src/amitk_object_dialog.h 2007-02-26 05:16:37.000000000 +0100 +++ amide-0.9.1-new/src/amitk_object_dialog.h 2009-06-20 01:44:06.000000000 +0200 @@ -39,10 +39,10 @@ /* ------------- Threshold---------- */ #define AMITK_TYPE_OBJECT_DIALOG (amitk_object_dialog_get_type ()) -#define AMITK_OBJECT_DIALOG(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_OBJECT_DIALOG, AmitkObjectDialog)) -#define AMITK_OBJECT_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkObjectDialogClass)) -#define AMITK_IS_OBJECT_DIALOG(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_OBJECT_DIALOG)) -#define AMITK_IS_OBJECT_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_OBJECT_DIALOG)) +#define AMITK_OBJECT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_OBJECT_DIALOG, AmitkObjectDialog)) +#define AMITK_OBJECT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkObjectDialogClass)) +#define AMITK_IS_OBJECT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_OBJECT_DIALOG)) +#define AMITK_IS_OBJECT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_OBJECT_DIALOG)) typedef struct _AmitkObjectDialog AmitkObjectDialog; diff -dPNur amide-0.9.1/src/amitk_progress_dialog.h amide-0.9.1-new/src/amitk_progress_dialog.h --- amide-0.9.1/src/amitk_progress_dialog.h 2007-02-26 05:16:36.000000000 +0100 +++ amide-0.9.1-new/src/amitk_progress_dialog.h 2009-06-20 01:46:50.000000000 +0200 @@ -36,10 +36,10 @@ /* ------------- Progress_Dialog---------- */ #define AMITK_TYPE_PROGRESS_DIALOG (amitk_progress_dialog_get_type ()) -#define AMITK_PROGRESS_DIALOG(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_PROGRESS_DIALOG, AmitkProgressDialog)) -#define AMITK_PROGRESS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkProgressDialogClass)) -#define AMITK_IS_PROGRESS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_PROGRESS_DIALOG)) -#define AMITK_IS_PROGRESS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_PROGRESS_DIALOG)) +#define AMITK_PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_PROGRESS_DIALOG, AmitkProgressDialog)) +#define AMITK_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkProgressDialogClass)) +#define AMITK_IS_PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_PROGRESS_DIALOG)) +#define AMITK_IS_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_PROGRESS_DIALOG)) #define AMITK_PROGRESS_DIALOG_CAN_CONTINUE(obj) (AMITK_PROGRESS_DIALOG(obj)->can_continue); diff -dPNur amide-0.9.1/src/amitk_space_edit.h amide-0.9.1-new/src/amitk_space_edit.h --- amide-0.9.1/src/amitk_space_edit.h 2007-02-26 05:16:34.000000000 +0100 +++ amide-0.9.1-new/src/amitk_space_edit.h 2009-06-20 01:47:27.000000000 +0200 @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define AMITK_TYPE_SPACE_EDIT (amitk_space_edit_get_type ()) -#define AMITK_SPACE_EDIT(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_SPACE_EDIT, AmitkSpaceEdit)) -#define AMITK_SPACE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_SPACE_EDIT, AmitkSpaceEditClass)) -#define AMITK_IS_SPACE_EDIT(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_SPACE_EDIT)) -#define AMITK_IS_SPACE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_SPACE_EDIT)) +#define AMITK_SPACE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_SPACE_EDIT, AmitkSpaceEdit)) +#define AMITK_SPACE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_SPACE_EDIT, AmitkSpaceEditClass)) +#define AMITK_IS_SPACE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_SPACE_EDIT)) +#define AMITK_IS_SPACE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_SPACE_EDIT)) typedef struct _AmitkSpaceEdit AmitkSpaceEdit; typedef struct _AmitkSpaceEditClass AmitkSpaceEditClass; diff -dPNur amide-0.9.1/src/amitk_threshold.h amide-0.9.1-new/src/amitk_threshold.h --- amide-0.9.1/src/amitk_threshold.h 2007-02-26 05:18:00.000000000 +0100 +++ amide-0.9.1-new/src/amitk_threshold.h 2009-06-20 01:51:12.000000000 +0200 @@ -39,10 +39,10 @@ /* ------------- Threshold---------- */ #define AMITK_TYPE_THRESHOLD (amitk_threshold_get_type ()) -#define AMITK_THRESHOLD(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_THRESHOLD, AmitkThreshold)) -#define AMITK_THRESHOLD_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkThresholdClass)) -#define AMITK_IS_THRESHOLD(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_THRESHOLD)) -#define AMITK_IS_THRESHOLD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_THRESHOLD)) +#define AMITK_THRESHOLD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_THRESHOLD, AmitkThreshold)) +#define AMITK_THRESHOLD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkThresholdClass)) +#define AMITK_IS_THRESHOLD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_THRESHOLD)) +#define AMITK_IS_THRESHOLD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_THRESHOLD)) typedef struct _AmitkThreshold AmitkThreshold; typedef struct _AmitkThresholdClass AmitkThresholdClass; @@ -146,10 +146,10 @@ /* ---------- ThresholdDialog------------- */ #define AMITK_TYPE_THRESHOLD_DIALOG (amitk_threshold_dialog_get_type ()) -#define AMITK_THRESHOLD_DIALOG(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_THRESHOLD_DIALOG, AmitkThresholdDialog)) -#define AMITK_THRESHOLD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD_DIALOG, AmitkThresholdDialogClass)) -#define AMITK_IS_THRESHOLD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_THRESHOLD_DIALOG)) -#define AMITK_IS_THRESHOLD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_THRESHOLD_DIALOG)) +#define AMITK_THRESHOLD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_THRESHOLD_DIALOG, AmitkThresholdDialog)) +#define AMITK_THRESHOLD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD_DIALOG, AmitkThresholdDialogClass)) +#define AMITK_IS_THRESHOLD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_THRESHOLD_DIALOG)) +#define AMITK_IS_THRESHOLD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_THRESHOLD_DIALOG)) typedef struct _AmitkThresholdDialog AmitkThresholdDialog; typedef struct _AmitkThresholdDialogClass AmitkThresholdDialogClass; @@ -180,10 +180,10 @@ /*---------- ThresholdDialogs--------------- */ #define AMITK_TYPE_THRESHOLDS_DIALOG (amitk_thresholds_dialog_get_type ()) -#define AMITK_THRESHOLDS_DIALOG(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_THRESHOLDS_DIALOG, AmitkThresholdsDialog)) -#define AMITK_THRESHOLDS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLDS_DIALOG, AmitkThresholdsDialogClass)) -#define AMITK_IS_THRESHOLDS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_THRESHOLDS_DIALOG)) -#define AMITK_IS_THRESHOLDS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_THRESHOLDS_DIALOG)) +#define AMITK_THRESHOLDS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_THRESHOLDS_DIALOG, AmitkThresholdsDialog)) +#define AMITK_THRESHOLDS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLDS_DIALOG, AmitkThresholdsDialogClass)) +#define AMITK_IS_THRESHOLDS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_THRESHOLDS_DIALOG)) +#define AMITK_IS_THRESHOLDS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_THRESHOLDS_DIALOG)) typedef struct _AmitkThresholdsDialog AmitkThresholdsDialog; typedef struct _AmitkThresholdsDialogClass AmitkThresholdsDialogClass; diff -dPNur amide-0.9.1/src/amitk_tree_view.h amide-0.9.1-new/src/amitk_tree_view.h --- amide-0.9.1/src/amitk_tree_view.h 2007-11-08 21:22:20.000000000 +0100 +++ amide-0.9.1-new/src/amitk_tree_view.h 2009-06-20 01:48:26.000000000 +0200 @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define AMITK_TYPE_TREE_VIEW (amitk_tree_view_get_type ()) -#define AMITK_TREE_VIEW(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_TREE_VIEW, AmitkTreeView)) -#define AMITK_TREE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkTreeViewClass)) -#define AMITK_IS_TREE_VIEW(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_TREE_VIEW)) -#define AMITK_IS_TREE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_TREE_VIEW)) +#define AMITK_TREE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_TREE_VIEW, AmitkTreeView)) +#define AMITK_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_THESHOLD, AmitkTreeViewClass)) +#define AMITK_IS_TREE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_TREE_VIEW)) +#define AMITK_IS_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_TREE_VIEW)) typedef enum { AMITK_TREE_VIEW_MODE_MAIN, diff -dPNur amide-0.9.1/src/amitk_window_edit.h amide-0.9.1-new/src/amitk_window_edit.h --- amide-0.9.1/src/amitk_window_edit.h 2007-02-26 05:17:59.000000000 +0100 +++ amide-0.9.1-new/src/amitk_window_edit.h 2009-06-20 01:48:53.000000000 +0200 @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define AMITK_TYPE_WINDOW_EDIT (amitk_window_edit_get_type ()) -#define AMITK_WINDOW_EDIT(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_WINDOW_EDIT, AmitkWindowEdit)) -#define AMITK_WINDOW_EDIT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_WINDOW_EDIT, AmitkWindowEditClass)) -#define AMITK_IS_WINDOW_EDIT(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_WINDOW_EDIT)) -#define AMITK_IS_WINDOW_EDIT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_WINDOW_EDIT)) +#define AMITK_WINDOW_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_WINDOW_EDIT, AmitkWindowEdit)) +#define AMITK_WINDOW_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_WINDOW_EDIT, AmitkWindowEditClass)) +#define AMITK_IS_WINDOW_EDIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_WINDOW_EDIT)) +#define AMITK_IS_WINDOW_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_WINDOW_EDIT)) typedef struct _AmitkWindowEdit AmitkWindowEdit; typedef struct _AmitkWindowEditClass AmitkWindowEditClass; diff -dPNur amide-0.9.1/src/amitk_xif_sel.h amide-0.9.1-new/src/amitk_xif_sel.h --- amide-0.9.1/src/amitk_xif_sel.h 2003-06-30 19:32:45.000000000 +0200 +++ amide-0.9.1-new/src/amitk_xif_sel.h 2009-06-20 01:42:29.000000000 +0200 @@ -39,10 +39,10 @@ G_BEGIN_DECLS #define AMITK_TYPE_XIF_SELECTION (amitk_xif_selection_get_type ()) -#define AMITK_XIF_SELECTION(obj) (GTK_CHECK_CAST ((obj), AMITK_TYPE_XIF_SELECTION, AmitkXifSelection)) -#define AMITK_XIF_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), AMITK_TYPE_XIF_SELECTION, AmitkXifSelectionClass)) -#define AMITK_IS_XIF_SELECTION(obj) (GTK_CHECK_TYPE ((obj), AMITK_TYPE_XIF_SELECTION)) -#define AMITK_IS_XIF_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_XIF_SELECTION)) +#define AMITK_XIF_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMITK_TYPE_XIF_SELECTION, AmitkXifSelection)) +#define AMITK_XIF_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AMITK_TYPE_XIF_SELECTION, AmitkXifSelectionClass)) +#define AMITK_IS_XIF_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AMITK_TYPE_XIF_SELECTION)) +#define AMITK_IS_XIF_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AMITK_TYPE_XIF_SELECTION)) #define AMITK_XIF_SELECTION_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), AMITK_TYPE_XIF_SELECTION, AmitkXifSelectionClass)) @@ -94,7 +94,7 @@ }; -GtkType amitk_xif_selection_get_type (void) G_GNUC_CONST; +GType amitk_xif_selection_get_type (void) G_GNUC_CONST; GtkWidget* amitk_xif_selection_new (const gchar *title); void amitk_xif_selection_set_filename (AmitkXifSelection *filesel, const gchar *filename); diff -dPNur amide-0.9.1/src/tb_fads.c amide-0.9.1-new/src/tb_fads.c --- amide-0.9.1/src/tb_fads.c 2007-11-22 11:28:15.000000000 +0100 +++ amide-0.9.1-new/src/tb_fads.c 2009-06-20 02:01:25.000000000 +0200 @@ -183,7 +183,7 @@ gint response_id; gchar * save_filename; - fs = gtk_file_selection_new(_("Filename for Factor Data")); + fs = gtk_file_chooser_dialog_new(_("Filename for Factor Data"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); /* take a guess at the filename */ analysis_name = g_strdup_printf("%s_fads_analysis.tsv",AMITK_OBJECT_NAME(tb_fads->data_set)); @@ -195,7 +195,7 @@ save_filename = ui_common_file_selection_get_save_name(fs, TRUE); gtk_widget_destroy(GTK_WIDGET(fs)); - if (response_id == GTK_RESPONSE_OK) + if (response_id == GTK_RESPONSE_ACCEPT) return save_filename; else return NULL;