From 59e1bb938278f59e0e2dbc2d179230b5f73467b6 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 26 Jun 2011 00:29:40 +0100 Subject: Gtk cleanup: gtk_object_set_data (bzr r10350.1.5) --- src/widgets/gradient-toolbar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/gradient-toolbar.cpp') diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 9186044de..96dadcc26 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -467,7 +467,7 @@ GtkWidget * gr_change_widget(SPDesktop *desktop) gr_read_selection (selection, ev? ev->get_drag() : 0, gr_selected, gr_multi, spr_selected, spr_multi); GtkWidget *widget = gtk_hbox_new(FALSE, FALSE); - gtk_object_set_data(GTK_OBJECT(widget), "dtw", desktop->canvas); + g_object_set_data(G_OBJECT(widget), "dtw", desktop->canvas); g_object_set_data (G_OBJECT (widget), "desktop", desktop); GtkWidget *om = gr_vector_list (desktop, selection->isEmpty(), gr_selected, gr_multi); @@ -537,8 +537,8 @@ sp_gradient_toolbox_new(SPDesktop *desktop) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); GtkWidget *tbl = gtk_toolbar_new(); - gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); - gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); + g_object_set_data(G_OBJECT(tbl), "dtw", desktop->canvas); + g_object_set_data(G_OBJECT(tbl), "desktop", desktop); sp_toolbox_add_label(tbl, _("New:")); -- cgit v1.2.3 From f5437faac0a6b2d95f6acad0dd3a03c1759bc255 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 26 Jun 2011 01:30:49 +0100 Subject: Gtk cleanup: gtk_menu_append (bzr r10350.1.7) --- src/widgets/gradient-toolbar.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/widgets/gradient-toolbar.cpp') diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 96dadcc26..6d4f6fae0 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -193,7 +193,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient * gtk_container_add (GTK_CONTAINER (i), l); gtk_widget_show (i); - gtk_menu_append (GTK_MENU (m), i); + gtk_menu_shell_append(GTK_MENU_SHELL (m), i); gtk_widget_set_sensitive (om, FALSE); } else if (selection_empty) { // Document has gradients, but nothing is currently selected. @@ -203,7 +203,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient * gtk_container_add (GTK_CONTAINER (i), l); gtk_widget_show (i); - gtk_menu_append (GTK_MENU (m), i); + gtk_menu_shell_append(GTK_MENU_SHELL (m), i); gtk_widget_set_sensitive (om, FALSE); } else { @@ -214,7 +214,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient * gtk_container_add (GTK_CONTAINER (i), l); gtk_widget_show (i); - gtk_menu_append (GTK_MENU (m), i); + gtk_menu_shell_append(GTK_MENU_SHELL (m), i); } if (gr_multi) { @@ -224,7 +224,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient * gtk_container_add (GTK_CONTAINER (i), l); gtk_widget_show (i); - gtk_menu_append (GTK_MENU (m), i); + gtk_menu_shell_append(GTK_MENU_SHELL (m), i); } while (gl) { @@ -250,7 +250,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient * gtk_container_add (GTK_CONTAINER (i), hb); - gtk_menu_append (GTK_MENU (m), i); + gtk_menu_shell_append(GTK_MENU_SHELL (m), i); if (gradient == gr_selected) { pos = idx; -- cgit v1.2.3