[gnumeric] gtk: use gtk_widget_destroy, not gtk_object_destroy.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] gtk: use gtk_widget_destroy, not gtk_object_destroy.
- Date: Mon, 4 Apr 2011 20:59:38 +0000 (UTC)
commit 826479662e2bab9e123fbfd1e5e78db59a2f3ca5
Author: Morten Welinder <terra gnome org>
Date: Mon Apr 4 16:59:19 2011 -0400
gtk: use gtk_widget_destroy, not gtk_object_destroy.
src/dialogs/dialog-cell-format.c | 2 +-
src/dialogs/dialog-data-table.c | 2 +-
src/dialogs/dialog-recent.c | 4 ++--
src/dialogs/dialog-so-list.c | 2 +-
src/dialogs/dialog-so-styled.c | 2 +-
src/gnm-pane.c | 4 ++--
src/io-context-gtk.c | 2 +-
src/item-bar.c | 2 +-
src/sheet-control-gui.c | 8 ++++----
src/wbc-gtk.c | 4 ++--
src/widgets/gnumeric-expr-entry.c | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index c48c147..1b68cfa 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -2329,7 +2329,7 @@ cb_fmt_dialog_dialog_buttons (GtkWidget *btn, FormatState *state)
}
if (btn != state->apply_button)
- gtk_object_destroy (GTK_OBJECT (state->dialog));
+ gtk_widget_destroy (GTK_WIDGET (state->dialog));
}
/* Handler for destroy */
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index 65698c5..90321d1 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -86,7 +86,7 @@ cb_data_table_response (GtkWidget *dialog, gint response_id, GnmDialogDataTable
state->sheet, &state->input_range,
gnm_expr_entry_get_text (state->col_entry),
gnm_expr_entry_get_text (state->row_entry));
- gtk_object_destroy (GTK_OBJECT (dialog));
+ gtk_widget_destroy (dialog);
}
static gboolean
diff --git a/src/dialogs/dialog-recent.c b/src/dialogs/dialog-recent.c
index 0c1b4e7..e0a9f8b 100644
--- a/src/dialogs/dialog-recent.c
+++ b/src/dialogs/dialog-recent.c
@@ -52,13 +52,13 @@ cb_response (GtkWidget *dialog,
* This causes crashes with gtk+ 2.10.6, at least.
*/
#if 0
- gtk_object_destroy (GTK_OBJECT (dialog));
+ gtk_widget_destroy (dialog);
#endif
break;
}
default:
- gtk_object_destroy (GTK_OBJECT (dialog));
+ gtk_widget_destroy (dialog);
}
}
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index da7c62e..8d5c382 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -93,7 +93,7 @@ cb_so_list_response (GtkWidget *dialog, gint response_id, GnmDialogSOList *state
(state->as_index_radio)));
}
- gtk_object_destroy (GTK_OBJECT (dialog));
+ gtk_widget_destroy (dialog);
}
static gboolean
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 640601d..1425c12 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -81,7 +81,7 @@ cb_dialog_so_styled_response (GtkWidget *dialog,
pango_attr_list_unref (pref->orig_attributes);
pref->orig_attributes = NULL;
}
- gtk_object_destroy (GTK_OBJECT (dialog));
+ gtk_widget_destroy (dialog);
}
static void
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 62a5fa6..5bf5c4d 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -856,12 +856,12 @@ gnm_pane_dispose (GObject *obj)
GnmPane *pane = GNM_PANE (obj);
if (pane->col.canvas != NULL) {
- gtk_object_destroy (GTK_OBJECT (pane->col.canvas));
+ gtk_widget_destroy (GTK_WIDGET (pane->col.canvas));
pane->col.canvas = NULL;
}
if (pane->row.canvas != NULL) {
- gtk_object_destroy (GTK_OBJECT (pane->row.canvas));
+ gtk_widget_destroy (GTK_WIDGET (pane->row.canvas));
pane->row.canvas = NULL;
}
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 32e100b..18531d7 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -346,7 +346,7 @@ icg_finalize (GObject *obj)
G_CALLBACK (cb_icg_window_destroyed), icg);
gtk_window_set_focus (icg->window, NULL);
gtk_window_set_default (icg->window, NULL);
- gtk_object_destroy (GTK_OBJECT (icg->window));
+ gtk_widget_destroy (GTK_WIDGET (icg->window));
}
g_free (icg->progress_msg);
icg->window = NULL;
diff --git a/src/item-bar.c b/src/item-bar.c
index 384dd0c..5cd6e71 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -1072,7 +1072,7 @@ item_bar_dispose (GObject *obj)
ib_fonts_unref (ib);
if (ib->tip) {
- gtk_object_destroy (GTK_OBJECT (ib->tip));
+ gtk_widget_destroy (ib->tip);
ib->tip = NULL;
}
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 424f44b..4521698 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -653,7 +653,7 @@ cb_table_destroy (SheetControlGUI *scg)
for (i = scg->active_panes; i-- > 0 ; )
if (NULL != scg->pane[i]) {
- gtk_object_destroy (GTK_OBJECT (scg->pane[i]));
+ gtk_widget_destroy (GTK_WIDGET (scg->pane[i]));
scg->pane[i] = NULL;
}
@@ -1137,7 +1137,7 @@ scg_set_panes (SheetControl *sc)
int i;
for (i = 1 ; i <= 3 ; i++)
if (scg->pane[i]) {
- gtk_object_destroy (GTK_OBJECT (scg->pane[i]));
+ gtk_widget_destroy (GTK_WIDGET (scg->pane[i]));
scg->pane[i] = NULL;
}
@@ -1681,7 +1681,7 @@ scg_finalize (GObject *object)
}
if (scg->table) {
- gtk_object_destroy (GTK_OBJECT (scg->table));
+ gtk_widget_destroy (GTK_WIDGET (scg->table));
g_object_unref (scg->table);
scg->table = NULL;
}
@@ -3013,7 +3013,7 @@ scg_comment_unselect (SheetControlGUI *scg, GnmComment *cc)
scg_comment_timer_clear (scg);
if (scg->comment.item != NULL) {
- gtk_object_destroy (GTK_OBJECT (scg->comment.item));
+ gtk_widget_destroy (scg->comment.item);
scg->comment.item = NULL;
}
}
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 575e181..edf2d56 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -709,7 +709,7 @@ cb_sheet_label_drag_end (GtkWidget *widget, GdkDragContext *context,
/* Destroy the arrow. */
arrow = g_object_get_data (G_OBJECT (widget), "arrow");
- gtk_object_destroy (GTK_OBJECT (arrow));
+ gtk_widget_destroy (arrow);
g_object_unref (arrow);
g_object_set_data (G_OBJECT (widget), "arrow", NULL);
}
@@ -5321,7 +5321,7 @@ wbc_gtk_finalize (GObject *obj)
gtk_window_set_focus (wbcg_toplevel (wbcg), NULL);
if (wbcg->toplevel != NULL) {
- gtk_object_destroy (GTK_OBJECT (wbcg->toplevel));
+ gtk_widget_destroy (wbcg->toplevel);
wbcg->toplevel = NULL;
}
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 6b63a19..f45ddbc 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -464,7 +464,7 @@ gee_set_property (GObject *object,
G_CALLBACK (cb_icon_clicked), gee);
}
} else if (gee->icon != NULL)
- gtk_object_destroy (GTK_OBJECT (gee->icon));
+ gtk_widget_destroy (gee->icon);
break;
case PROP_TEXT: {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]