diff --git a/lib/goffice/go-optionmenu.c b/lib/goffice/go-optionmenu.c index b7d16b28d1..b933e55bcf 100644 --- a/lib/goffice/go-optionmenu.c +++ b/lib/goffice/go-optionmenu.c @@ -353,13 +353,13 @@ static void go_option_menu_get_property(GObject *object, guint prop_id, } } -static void go_option_menu_destroy(GtkObject *object) +static void go_option_menu_destroy(GtkWidget *widget) { GOOptionMenu *option_menu; - g_return_if_fail(GO_IS_OPTION_MENU(object)); + g_return_if_fail(GO_IS_OPTION_MENU(widget)); - option_menu = GO_OPTION_MENU(object); + option_menu = GO_OPTION_MENU(widget); if (option_menu->menu) { @@ -369,13 +369,12 @@ static void go_option_menu_destroy(GtkObject *object) } option_menu->selected = NULL; - GTK_OBJECT_CLASS(parent_class)->destroy(object); + GTK_WIDGET_CLASS(parent_class)->destroy(widget); } static void go_option_menu_class_init(GOOptionMenuClass *class) { GObjectClass *gobject_class = (GObjectClass*) class; - GtkObjectClass *object_class = (GtkObjectClass*) class; GtkWidgetClass *widget_class = (GtkWidgetClass*) class; parent_class = g_type_class_peek_parent(class); @@ -386,7 +385,7 @@ static void go_option_menu_class_init(GOOptionMenuClass *class) gobject_class->set_property = go_option_menu_set_property; gobject_class->get_property = go_option_menu_get_property; - object_class->destroy = go_option_menu_destroy; + widget_class->destroy = go_option_menu_destroy; widget_class->button_press_event = go_option_menu_button_press; widget_class->key_press_event = go_option_menu_key_press; diff --git a/src/gnome-search/gnc-general-search.c b/src/gnome-search/gnc-general-search.c index a33da6a86c..5ab332e9ed 100644 --- a/src/gnome-search/gnc-general-search.c +++ b/src/gnome-search/gnc-general-search.c @@ -59,7 +59,7 @@ enum static void gnc_general_search_init (GNCGeneralSearch *gsl); static void gnc_general_search_class_init (GNCGeneralSearchClass *klass); -static void gnc_general_search_destroy (GtkObject *object); +static void gnc_general_search_destroy (GtkWidget *widget); typedef struct _GNCGeneralSearchPrivate GNCGeneralSearchPrivate; @@ -117,9 +117,7 @@ gnc_general_search_get_type (void) static void gnc_general_search_class_init (GNCGeneralSearchClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass *) klass; - - object_class = (GtkObjectClass*) klass; + GtkWidgetClass *object_class = (GtkWidgetClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -146,15 +144,15 @@ gnc_general_search_init (GNCGeneralSearch *gsl) } static void -gnc_general_search_destroy (GtkObject *object) +gnc_general_search_destroy (GtkWidget *widget) { GNCGeneralSearch *gsl; GNCGeneralSearchPrivate *priv; - g_return_if_fail (object != NULL); - g_return_if_fail (GNC_IS_GENERAL_SEARCH (object)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GNC_IS_GENERAL_SEARCH (widget)); - gsl = GNC_GENERAL_SEARCH (object); + gsl = GNC_GENERAL_SEARCH (widget); gsl->entry = NULL; gsl->button = NULL; @@ -174,8 +172,8 @@ gnc_general_search_destroy (GtkObject *object) priv->component_id = 0; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (GTK_WIDGET_CLASS (parent_class)->destroy) + GTK_WIDGET_CLASS (parent_class)->destroy (widget); } /* The "selection" contents have changed. Change the text. */ diff --git a/src/gnome-utils/gnc-frequency.c b/src/gnome-utils/gnc-frequency.c index b5e88d2194..bba0c74a7e 100644 --- a/src/gnome-utils/gnc-frequency.c +++ b/src/gnome-utils/gnc-frequency.c @@ -58,7 +58,7 @@ static guint gnc_frequency_signals[LAST_SIGNAL] = { 0 }; /** Private Prototypes ********************/ static void gnc_frequency_class_init( GncFrequencyClass *klass ); -static void gnc_frequency_class_destroy( GtkObject *object ); +static void gnc_frequency_class_destroy( GtkWidget *widget ); static void freq_combo_changed( GtkComboBox *b, gpointer d ); static void start_date_changed( GNCDateEdit *gde, gpointer d ); @@ -140,12 +140,12 @@ static void gnc_frequency_class_init( GncFrequencyClass *klass ) { GObjectClass *object_class; - GtkObjectClass *gtkobject_class; + GtkWidgetClass *gtkwidget_class; parent_class = g_type_class_peek_parent (klass); object_class = G_OBJECT_CLASS (klass); - gtkobject_class = GTK_OBJECT_CLASS (klass); + gtkwidget_class = GTK_WIDGET_CLASS (klass); gnc_frequency_signals[GNCFREQ_CHANGED] = g_signal_new ("changed", @@ -158,8 +158,8 @@ gnc_frequency_class_init( GncFrequencyClass *klass ) G_TYPE_NONE, 0); - /* GtkObject signals */ - gtkobject_class->destroy = gnc_frequency_class_destroy; + /* GtkWidget signals */ + gtkwidget_class->destroy = gnc_frequency_class_destroy; } @@ -273,23 +273,23 @@ gnc_frequency_init(GncFrequency *gf) } -/** Destroy the GncFrequency object. This function is called (possibly - * multiple times) from the Gtk_Object level to destroy the object. +/** Destroy the GncFrequency widget. This function is called (possibly + * multiple times) from the Gtk_Object level to destroy the widget. * - * @param object The object being destroyed. + * @param widget The widget being destroyed. * * @internal */ static void -gnc_frequency_class_destroy (GtkObject *object) +gnc_frequency_class_destroy (GtkWidget *widget) { GncFrequency *gf; - ENTER("frequency %p", object); - g_return_if_fail (object != NULL); - g_return_if_fail (GNC_IS_FREQUENCY (object)); + ENTER("frequency %p", widget); + g_return_if_fail (widget != NULL); + g_return_if_fail (GNC_IS_FREQUENCY (widget)); - gf = GNC_FREQUENCY (object); + gf = GNC_FREQUENCY (widget); if (gf->builder) { @@ -298,8 +298,8 @@ gnc_frequency_class_destroy (GtkObject *object) gf->builder = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (GTK_WIDGET_CLASS (parent_class)->destroy) + GTK_WIDGET_CLASS (parent_class)->destroy (widget); LEAVE(" "); } diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 73f969acbd..04dbe26ff6 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -126,7 +126,7 @@ static guint secs_to_save = 0; static void gnc_main_window_class_init (GncMainWindowClass *klass); static void gnc_main_window_init (GncMainWindow *window, GncMainWindowClass *klass); static void gnc_main_window_finalize (GObject *object); -static void gnc_main_window_destroy (GtkObject *object); +static void gnc_main_window_destroy (GtkWidget *widget); static void gnc_main_window_setup_window (GncMainWindow *window); static void gnc_window_main_window_init (GncWindowIface *iface); @@ -2443,7 +2443,7 @@ static void gnc_main_window_class_init (GncMainWindowClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS(klass); + GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS(klass); parent_class = g_type_class_peek_parent (klass); @@ -2451,8 +2451,8 @@ gnc_main_window_class_init (GncMainWindowClass *klass) object_class->finalize = gnc_main_window_finalize; - /* GtkObject signals */ - gtkobject_class->destroy = gnc_main_window_destroy; + /* GtkWidget signals */ + gtkwidget_class->destroy = gnc_main_window_destroy; g_type_class_add_private(klass, sizeof(GncMainWindowPrivate)); @@ -2578,17 +2578,17 @@ gnc_main_window_finalize (GObject *object) static void -gnc_main_window_destroy (GtkObject *object) +gnc_main_window_destroy (GtkWidget *widget) { GncMainWindow *window; GncMainWindowPrivate *priv; GncPluginManager *manager; GList *plugins; - g_return_if_fail (object != NULL); - g_return_if_fail (GNC_IS_MAIN_WINDOW (object)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GNC_IS_MAIN_WINDOW (widget)); - window = GNC_MAIN_WINDOW (object); + window = GNC_MAIN_WINDOW (widget); active_windows = g_list_remove (active_windows, window); @@ -2626,7 +2626,7 @@ gnc_main_window_destroy (GtkObject *object) } if (priv->about_dialog) g_object_unref (priv->about_dialog); - GTK_OBJECT_CLASS (parent_class)->destroy (object); + GTK_WIDGET_CLASS (parent_class)->destroy (widget); } diff --git a/src/gnome-utils/gnc-query-view.c b/src/gnome-utils/gnc-query-view.c index 151aec84eb..1f0d473bdf 100644 --- a/src/gnome-utils/gnc-query-view.c +++ b/src/gnome-utils/gnc-query-view.c @@ -68,7 +68,7 @@ static void gnc_query_view_double_click_cb (GtkTreeView *tree_view, GtkTreeViewColumn *column, gpointer user_data); -static void gnc_query_view_destroy (GtkObject *object); +static void gnc_query_view_destroy (GtkWidget *widget); static void gnc_query_view_fill (GNCQueryView *qview); static void gnc_query_view_set_query_sort (GNCQueryView *qview, gboolean new_column); @@ -412,10 +412,10 @@ gnc_query_view_init_view (GNCQueryView *qview) static void gnc_query_view_class_init (GNCQueryViewClass *klass) { - GtkObjectClass *object_class; + GtkWidgetClass *widget_class; GtkTreeViewClass *view_class; - object_class = (GtkObjectClass*) klass; + widget_class = (GtkWidgetClass*) klass; view_class = (GtkTreeViewClass*) klass; parent_class = g_type_class_peek (GTK_TYPE_TREE_VIEW); @@ -424,7 +424,7 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) query_view_signals[COLUMN_TOGGLED] = g_signal_new("column_toggled", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (widget_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GNCQueryViewClass, column_toggled), NULL, NULL, @@ -435,7 +435,7 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) query_view_signals[ROW_SELECTED] = g_signal_new("row_selected", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (widget_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GNCQueryViewClass, row_selected), NULL, NULL, @@ -446,7 +446,7 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) query_view_signals[DOUBLE_CLICK_ENTRY] = g_signal_new("double_click_entry", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (widget_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GNCQueryViewClass, double_click_entry), NULL, NULL, @@ -455,7 +455,7 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) 1, G_TYPE_POINTER); - object_class->destroy = gnc_query_view_destroy; + widget_class->destroy = gnc_query_view_destroy; klass->column_toggled = NULL; klass->row_selected = NULL; @@ -571,9 +571,9 @@ gnc_query_view_toggled_cb (GtkCellRendererToggle *cell_renderer, static void -gnc_query_view_destroy (GtkObject *object) +gnc_query_view_destroy (GtkWidget *widget) { - GNCQueryView *qview = GNC_QUERY_VIEW (object); + GNCQueryView *qview = GNC_QUERY_VIEW (widget); GNCQueryViewPriv *priv; priv = GNC_QUERY_VIEW_GET_PRIVATE (qview); @@ -594,8 +594,8 @@ gnc_query_view_destroy (GtkObject *object) qof_query_destroy (qview->query); qview->query = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (GTK_WIDGET_CLASS (parent_class)->destroy) + GTK_WIDGET_CLASS (parent_class)->destroy (widget); } diff --git a/src/gnome-utils/gnc-tree-view-commodity.c b/src/gnome-utils/gnc-tree-view-commodity.c index eb9a9c2183..e01d4f721f 100644 --- a/src/gnome-utils/gnc-tree-view-commodity.c +++ b/src/gnome-utils/gnc-tree-view-commodity.c @@ -50,7 +50,7 @@ static QofLogModule log_module = GNC_MOD_GUI; static void gnc_tree_view_commodity_class_init (GncTreeViewCommodityClass *klass); static void gnc_tree_view_commodity_init (GncTreeViewCommodity *view); static void gnc_tree_view_commodity_finalize (GObject *object); -static void gnc_tree_view_commodity_destroy (GtkObject *object); +static void gnc_tree_view_commodity_destroy (GtkWidget *widget); typedef struct GncTreeViewCommodityPrivate { @@ -99,18 +99,18 @@ static void gnc_tree_view_commodity_class_init (GncTreeViewCommodityClass *klass) { GObjectClass *o_class; - GtkObjectClass *object_class; + GtkWidgetClass *widget_class; parent_class = g_type_class_peek_parent (klass); o_class = G_OBJECT_CLASS (klass); - object_class = GTK_OBJECT_CLASS (klass); + widget_class = GTK_WIDGET_CLASS (klass); /* GObject signals */ o_class->finalize = gnc_tree_view_commodity_finalize; - /* GtkObject signals */ - object_class->destroy = gnc_tree_view_commodity_destroy; + /* GtkWidget signals */ + widget_class->destroy = gnc_tree_view_commodity_destroy; g_type_class_add_private(klass, sizeof(GncTreeViewCommodityPrivate)); } @@ -133,15 +133,15 @@ gnc_tree_view_commodity_finalize (GObject *object) } static void -gnc_tree_view_commodity_destroy (GtkObject *object) +gnc_tree_view_commodity_destroy (GtkWidget *widget) { - g_return_if_fail (object != NULL); - g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY (object)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY (widget)); - ENTER("view %p", object); + ENTER("view %p", widget); - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (GTK_WIDGET_CLASS (parent_class)->destroy) + (* GTK_WIDGET_CLASS (parent_class)->destroy) (widget); LEAVE(" "); } diff --git a/src/gnome-utils/gnc-tree-view-price.c b/src/gnome-utils/gnc-tree-view-price.c index b0dc599b33..a1d90aed97 100644 --- a/src/gnome-utils/gnc-tree-view-price.c +++ b/src/gnome-utils/gnc-tree-view-price.c @@ -50,7 +50,7 @@ static QofLogModule log_module = GNC_MOD_GUI; static void gnc_tree_view_price_class_init (GncTreeViewPriceClass *klass); static void gnc_tree_view_price_init (GncTreeViewPrice *view); static void gnc_tree_view_price_finalize (GObject *object); -static void gnc_tree_view_price_destroy (GtkObject *object); +static void gnc_tree_view_price_destroy (GtkWidget *widget); typedef struct GncTreeViewPricePrivate { @@ -99,18 +99,18 @@ static void gnc_tree_view_price_class_init (GncTreeViewPriceClass *klass) { GObjectClass *o_class; - GtkObjectClass *object_class; + GtkWidgetClass *widget_class; parent_class = g_type_class_peek_parent (klass); o_class = G_OBJECT_CLASS (klass); - object_class = GTK_OBJECT_CLASS (klass); + widget_class = GTK_WIDGET_CLASS (klass); /* GObject signals */ o_class->finalize = gnc_tree_view_price_finalize; - /* GtkObject signals */ - object_class->destroy = gnc_tree_view_price_destroy; + /* GtkWidget signals */ + widget_class->destroy = gnc_tree_view_price_destroy; g_type_class_add_private(klass, sizeof(GncTreeViewPricePrivate)); } @@ -133,14 +133,14 @@ gnc_tree_view_price_finalize (GObject *object) } static void -gnc_tree_view_price_destroy (GtkObject *object) +gnc_tree_view_price_destroy (GtkWidget *widget) { - ENTER("view %p", object); - gnc_leave_return_if_fail (object != NULL); - gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_PRICE (object)); + ENTER("view %p", widget); + gnc_leave_return_if_fail (widget != NULL); + gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_PRICE (widget)); - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (GTK_WIDGET_CLASS (parent_class)->destroy) + (* GTK_WIDGET_CLASS (parent_class)->destroy) (widget); LEAVE(" "); } diff --git a/src/gnome-utils/gnc-tree-view.c b/src/gnome-utils/gnc-tree-view.c index a45fc03d51..4131faad16 100644 --- a/src/gnome-utils/gnc-tree-view.c +++ b/src/gnome-utils/gnc-tree-view.c @@ -77,7 +77,7 @@ static QofLogModule log_module = GNC_MOD_GUI; static void gnc_tree_view_class_init (GncTreeViewClass *klass); static void gnc_tree_view_init (GncTreeView *view, GncTreeViewClass *klass); static void gnc_tree_view_finalize (GObject *object); -static void gnc_tree_view_destroy (GtkObject *object); +static void gnc_tree_view_destroy (GtkWidget *widget); static void gnc_tree_view_set_property (GObject *object, guint prop_id, const GValue *value, @@ -183,12 +183,12 @@ static void gnc_tree_view_class_init (GncTreeViewClass *klass) { GObjectClass *gobject_class; - GtkObjectClass *gtkobject_class; + GtkWidgetClass *gtkwidget_class; parent_class = g_type_class_peek_parent (klass); gobject_class = G_OBJECT_CLASS (klass); - gtkobject_class = GTK_OBJECT_CLASS (klass); + gtkwidget_class = GTK_WIDGET_CLASS (klass); gobject_class->set_property = gnc_tree_view_set_property; gobject_class->get_property = gnc_tree_view_get_property; @@ -213,8 +213,8 @@ gnc_tree_view_class_init (GncTreeViewClass *klass) /* GObject signals */ gobject_class->finalize = gnc_tree_view_finalize; - /* GtkObject signals */ - gtkobject_class->destroy = gnc_tree_view_destroy; + /* GtkWidget signals */ + gtkwidget_class->destroy = gnc_tree_view_destroy; } /** Initialize a new instance of a base gnucash tree view. This @@ -313,28 +313,28 @@ gnc_tree_view_finalize (GObject *object) LEAVE(" "); } -/** Destroy the GncTreeView object. This function is called (possibly - * multiple times) from the Gtk_Object level to destroy the object. - * It should release any memory owned by the object that isn't +/** Destroy the GncTreeView widget. This function is called (possibly + * multiple times) from the Gtk_Object level to destroy the widget. + * It should release any memory owned by the widget that isn't * fundamental to the implementation. In this function any active * callbacks are disconnected, all memory other than the private data * structure are freed. * - * @param object The object being destroyed. + * @param widget The widget being destroyed. * * @internal */ static void -gnc_tree_view_destroy (GtkObject *object) +gnc_tree_view_destroy (GtkWidget *widget) { GncTreeView *view; GncTreeViewPrivate *priv; - ENTER("view %p", object); - g_return_if_fail (object != NULL); - g_return_if_fail (GNC_IS_TREE_VIEW (object)); + ENTER("view %p", widget); + g_return_if_fail (widget != NULL); + g_return_if_fail (GNC_IS_TREE_VIEW (widget)); - view = GNC_TREE_VIEW (object); + view = GNC_TREE_VIEW (widget); priv = GNC_TREE_VIEW_GET_PRIVATE(view); @@ -352,8 +352,8 @@ gnc_tree_view_destroy (GtkObject *object) priv->column_menu = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (GTK_WIDGET_CLASS (parent_class)->destroy) + GTK_WIDGET_CLASS (parent_class)->destroy (widget); LEAVE(" "); }