[gnumeric] gtk: avoid GtkObject.



commit 0882fcf7023a285b90803ec964cfbcd1c4aad3ea
Author: Morten Welinder <terra gnome org>
Date:   Mon Apr 4 16:48:45 2011 -0400

    gtk: avoid GtkObject.

 src/dialogs/dialog-analysis-tool-kaplan-meier.c |   10 ++++++----
 src/dialogs/dialog-cell-format.c                |    4 ++--
 src/gnm-pane.c                                  |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 7b62cb6..0a2fb18 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -417,7 +417,7 @@ cb_change_from (GtkCellRendererText *cell,
 		GtkTreePath *path;
 		guint val = (guint) (atoi (new_text));
 		guint old_to;
-		GtkObject *adjustment_to;
+		GObject *adjustment_to;
 
 
 		path = gtk_tree_path_new_from_string (path_string);
@@ -439,7 +439,7 @@ cb_change_from (GtkCellRendererText *cell,
 			gtk_list_store_set (state->groups_list, &iter,
 					    GROUP_TO, val,
 					    -1);
-		g_object_set (G_OBJECT (adjustment_to), "lower", (gdouble) val, NULL);
+		g_object_set (adjustment_to, "lower", (gdouble) val, NULL);
 
 	}
 }
@@ -478,8 +478,10 @@ dialog_kaplan_meier_tool_treeview_add_item  (KaplanMeierToolState *state, guint
 {
 		GtkTreeIter iter;
 		char * name = g_strdup_printf (_("Group %d"), i);
-		GtkObject *adjustment_to = gtk_adjustment_new (0, 0, G_MAXUSHORT, 1, 1, 1);
-		GtkObject *adjustment_from = gtk_adjustment_new (0, 0, G_MAXUSHORT, 1, 1, 1);
+		GObject *adjustment_to =
+			G_OBJECT (gtk_adjustment_new (0, 0, G_MAXUSHORT, 1, 1, 1));
+		GObject *adjustment_from =
+			G_OBJECT (gtk_adjustment_new (0, 0, G_MAXUSHORT, 1, 1, 1));
 		gtk_list_store_append (state->groups_list, &iter);
 		gtk_list_store_set (state->groups_list, &iter,
 				    GROUP_NAME, name,
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 393366f..c48c147 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -280,9 +280,9 @@ cb_page_select (G_GNUC_UNUSED GtkNotebook *notebook,
 }
 
 static void
-cb_notebook_destroy (GtkObject *obj, gpointer page_sig_ptr)
+cb_notebook_destroy (GtkWidget *nb, gpointer page_sig_ptr)
 {
-	g_signal_handler_disconnect (obj, GPOINTER_TO_UINT (page_sig_ptr));
+	g_signal_handler_disconnect (nb, GPOINTER_TO_UINT (page_sig_ptr));
 }
 
 /*
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 5091ce0..d1a4836 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -841,7 +841,7 @@ cb_pane_init_objs (GnmPane *pane)
 }
 
 static void
-cb_ctrl_pts_free (GtkObject **ctrl_pts)
+cb_ctrl_pts_free (GObject **ctrl_pts)
 {
 	int i = 10;
 	while (i-- > 0)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]