From d677adf527e317075dd4c5451173d9c779c31c86 Mon Sep 17 00:00:00 2001 From: bertrand Date: Wed, 13 Jan 1999 20:37:47 +0000 Subject: [PATCH] 1999-01-13 bertrand * gdialogs.c * gwidget.c: * gprop.c: s/gtk_toggle_button_state/gtk_toggle_button_active --- gnome/ChangeLog | 7 +++++++ gnome/Makefile.in | 2 +- gnome/gdialogs.c | 12 ++++++------ gnome/gprop.c | 2 +- gnome/gwidget.c | 6 +++--- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index a5a87ed69..4c387e90c 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,10 @@ +1999-01-13 bertrand + + * gdialogs.c + * gwidget.c: + * gprop.c: + s/gtk_toggle_button_state/gtk_toggle_button_active + 1999-01-12 Miguel de Icaza * gdesktop.c (desktop_drag_data_received): Drops on the desktop by diff --git a/gnome/Makefile.in b/gnome/Makefile.in index f8aca5aae..982a98a20 100644 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -5,7 +5,7 @@ rootdir = $(srcdir)/.. @MCFG@@MCF@ GNOMEDEFS = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@ -CFLAGS = -g $(XCFLAGS) @X_CFLAGS@ -I. +CFLAGS = -g $(XCFLAGS) @X_CFLAGS@ -I. -I$(rootdir)/src CPPFLAGS = $(XCPPFLAGS) -I$(vfsdir) -I$(slangdir) $(GNOMEDEFS) LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@ CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@ diff --git a/gnome/gdialogs.c b/gnome/gdialogs.c index e05e7f48d..9926acf38 100644 --- a/gnome/gdialogs.c +++ b/gnome/gdialogs.c @@ -201,7 +201,7 @@ option_menu_policy_callback (GtkWidget *menu, gpointer data) { minor_copy_status = (gint) data; copy_status = (gint) data; - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (op_radio), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (op_radio), TRUE); } static void @@ -430,7 +430,7 @@ file_mask_dialog (FileOperation operation, char *text, char *def_text, int only_ def_text); gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (fentry), def_text); cbox = gtk_check_button_new_with_label (_("Copy as a background process")); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cbox), *do_background); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), *do_background); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, do_background); #if 0 gnome_widget_add_help (cbox, "Selecting this will run the copying in the background. " @@ -454,7 +454,7 @@ file_mask_dialog (FileOperation operation, char *text, char *def_text, int only_ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); cbox = gtk_check_button_new_with_label (_("Preserve symlinks")); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cbox), file_mask_stable_symlinks); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), file_mask_stable_symlinks); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &file_mask_stable_symlinks); #if 0 gnome_widget_add_help (cbox, "FIXME: Add something here Miguel"); @@ -464,14 +464,14 @@ file_mask_dialog (FileOperation operation, char *text, char *def_text, int only_ if (operation == OP_COPY) { cbox = gtk_check_button_new_with_label (_("Follow links.")); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cbox), file_mask_op_follow_links); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), file_mask_op_follow_links); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &file_mask_op_follow_links); gnome_widget_add_help (cbox, _("Selecting this will copy the files that symlinks point " "to instead of just copying the link.")); gtk_box_pack_start (GTK_BOX (vbox), cbox, FALSE, FALSE, 0); cbox = gtk_check_button_new_with_label (_("Preserve file attributes.")); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cbox), op_preserve); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), op_preserve); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &op_preserve); gnome_widget_add_help (cbox, _("Preserves the permissions and the UID/GID if possible")); gtk_box_pack_start (GTK_BOX (vbox), cbox, FALSE, FALSE, 0); @@ -479,7 +479,7 @@ file_mask_dialog (FileOperation operation, char *text, char *def_text, int only_ vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); cbox = gtk_check_button_new_with_label (_("Recursively copy subdirectories.")); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cbox), dive_into_subdirs); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), dive_into_subdirs); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &dive_into_subdirs); gnome_widget_add_help (cbox, _("If set, this will copy the directories recursively")); gtk_box_pack_start (GTK_BOX (vbox), cbox, FALSE, FALSE, 0); diff --git a/gnome/gprop.c b/gnome/gprop.c index b82a3a695..376f34e9c 100644 --- a/gnome/gprop.c +++ b/gnome/gprop.c @@ -209,7 +209,7 @@ perm_check_new (char *text, int state, GpropPerm *gp) check = gtk_check_button_new (); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (check), FALSE); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check), state ? TRUE : FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), state ? TRUE : FALSE); gtk_signal_connect (GTK_OBJECT (check), "toggled", (GtkSignalFunc) perm_set_mode_label, diff --git a/gnome/gwidget.c b/gnome/gwidget.c index 023c99def..0295c7f41 100644 --- a/gnome/gwidget.c +++ b/gnome/gwidget.c @@ -177,7 +177,7 @@ x_radio_toggle (WRadio *radio) for (i = 0; i < radio->count; i++){ GtkBoxChild *bc = (GtkBoxChild *) children->data; - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (bc->widget), (i == radio->sel) ? 1 : 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bc->widget), (i == radio->sel) ? 1 : 0); children = children->next; } } @@ -224,7 +224,7 @@ x_create_radio (Dlg_head *h, widget_data parent, WRadio *r) w = gtk_radio_button_new_with_label_from_widget (r->first_gtk_radio, text); g_free (text); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (w), (i == r->sel)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), (i == r->sel)); gtk_signal_connect (GTK_OBJECT (w), "toggled", GTK_SIGNAL_FUNC (radio_toggle), r); gtk_object_set_data (GTK_OBJECT (w), "index", (void *) (i+1)); gtk_box_pack_start_defaults (GTK_BOX (vbox), w); @@ -250,7 +250,7 @@ x_create_check (Dlg_head *h, widget_data parent, WCheck *c) GtkWidget *w; w = gtk_check_button_new_with_label (c->text); - gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (w), (c->state & C_BOOL)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), (c->state & C_BOOL)); gtk_signal_connect (GTK_OBJECT (w), "toggled", GTK_SIGNAL_FUNC (x_check_changed), c); gtk_widget_show (w); c->widget.wdata = (widget_data) w;