Mail Archives: geda-user/2014/10/14/16:18:58
Verbatim from Gtk+ 2 Reference Manual: "gtk_object_set_data_full is
deprecated and should not be used in newly-written code. Use
g_object_set_data_full() instead."
---
gschem/src/x_attribedit.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index ee0ad97..641f939 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -395,8 +395,8 @@ void attrib_edit_dialog (GschemToplevel *w_current, OBJECT *attr_obj, int flag)
value_entry = gtk_entry_new ();
gtk_widget_ref (value_entry);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "value_entry", value_entry,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "value_entry", value_entry,
+ (GtkDestroyNotify)gtk_widget_unref);
gtk_table_attach (GTK_TABLE (table), value_entry, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
@@ -405,8 +405,8 @@ void attrib_edit_dialog (GschemToplevel *w_current, OBJECT *attr_obj, int flag)
/* Visibility */
visbutton = gtk_check_button_new_with_label (_("Visible"));
gtk_widget_ref (visbutton);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "visbutton", visbutton,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "visbutton", visbutton,
+ (GtkDestroyNotify)gtk_widget_unref);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (visbutton), TRUE);
gtk_table_attach (GTK_TABLE (table), visbutton, 0, 1, 2, 3,
@@ -415,9 +415,8 @@ void attrib_edit_dialog (GschemToplevel *w_current, OBJECT *attr_obj, int flag)
show_options = gtk_option_menu_new ();
gtk_widget_ref (show_options);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "show_options",
- show_options,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "show_options", show_options,
+ (GtkDestroyNotify)gtk_widget_unref);
gtk_widget_show (show_options);
gtk_table_attach (GTK_TABLE (table), show_options, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
@@ -452,32 +451,35 @@ void attrib_edit_dialog (GschemToplevel *w_current, OBJECT *attr_obj, int flag)
addtoallbutton = gtk_radio_button_new_with_label (hbox2_group, _("All"));
hbox2_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(addtoallbutton));
gtk_widget_ref (addtoallbutton);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "addtoallbutton", addtoallbutton,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "addtoallbutton",
+ addtoallbutton, (GtkDestroyNotify)gtk_widget_unref);
gtk_table_attach(GTK_TABLE(table), addtoallbutton, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL), 0, 0, 0);
addtocompsbutton = gtk_radio_button_new_with_label (hbox2_group, _("Components"));
hbox2_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(addtocompsbutton));
gtk_widget_ref (addtocompsbutton);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "addtocompsbutton", addtocompsbutton,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "addtocompsbutton",
+ addtocompsbutton,
+ (GtkDestroyNotify)gtk_widget_unref);
gtk_table_attach(GTK_TABLE(table), addtocompsbutton, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL), 0, 0, 0);
addtonetsbutton = gtk_radio_button_new_with_label (hbox2_group, _("Nets"));
hbox2_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(addtonetsbutton));
gtk_widget_ref (addtonetsbutton);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "addtonetsbutton", addtonetsbutton,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "addtonetsbutton",
+ addtonetsbutton,
+ (GtkDestroyNotify)gtk_widget_unref);
gtk_table_attach(GTK_TABLE(table), addtonetsbutton, 2, 3, 0, 1,
(GtkAttachOptions) (GTK_FILL), 0, 0, 0);
overwritebutton = gtk_check_button_new_with_label (_("Replace existing attributes"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(overwritebutton), TRUE);
gtk_widget_ref (overwritebutton);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "overwritebutton", overwritebutton,
- (GtkDestroyNotify) gtk_widget_unref);
+ g_object_set_data_full(G_OBJECT(aewindow), "overwritebutton",
+ overwritebutton,
+ (GtkDestroyNotify)gtk_widget_unref);
gtk_table_attach(GTK_TABLE(table), overwritebutton, 0, 3, 1, 2,
(GtkAttachOptions) (GTK_FILL), 0, 0, 0);
}
--
2.1.0
- Raw text -