From c7cb9cc8d8d4439be5e35f44c5df4b94cc45144c Mon Sep 17 00:00:00 2001 From: Ralph Little Date: Thu, 26 Aug 2021 07:42:25 -0700 Subject: [PATCH] xscanimage: initial removal of direct member access. --- src/progress.c | 4 ++-- src/xscanimage.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/progress.c b/src/progress.c index 7366def..461e57b 100644 --- a/src/progress.c +++ b/src/progress.c @@ -58,8 +58,8 @@ progress_new (char *title, char *text, GtkWindow * parent, gtk_window_set_transient_for (GTK_WINDOW (p->shell), parent); #endif gtk_window_set_title (GTK_WINDOW (p->shell), title); - vbox = GTK_BOX (GTK_DIALOG (p->shell)->vbox); - hbox = GTK_BOX (GTK_DIALOG (p->shell)->action_area); + vbox = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (p->shell))); + hbox = GTK_BOX (gtk_dialog_get_action_area(GTK_DIALOG (p->shell))); gtk_container_border_width (GTK_CONTAINER (vbox), 7); diff --git a/src/xscanimage.c b/src/xscanimage.c index 1c0358d..426ca68 100644 --- a/src/xscanimage.c +++ b/src/xscanimage.c @@ -640,7 +640,7 @@ scan_preview (GtkWidget * widget, gpointer call_data) { DBG (DBG_debug, "scan_preview\n"); - if (GTK_TOGGLE_BUTTON (widget)->active) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { if (!scan_win.preview) { @@ -1433,7 +1433,7 @@ update_int_callback (GtkWidget * widget, gpointer data) { int *valuep = data; - *valuep = (GTK_TOGGLE_BUTTON (widget)->active != 0); + *valuep = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget)) != 0); } static void @@ -1502,7 +1502,7 @@ preview_options_dialog (GtkWidget * widget, gpointer data) sprintf (buf, "%s preview options", prog_name); gtk_window_set_title (GTK_WINDOW (dialog), buf); - vbox = GTK_DIALOG (dialog)->vbox; + vbox = gtk_dialog_get_content_area(GTK_DIALOG (dialog)); /* preserve preview image: */ @@ -1554,10 +1554,10 @@ preview_options_dialog (GtkWidget * widget, gpointer data) gtk_widget_show (text); /* fill in action area: */ - hbox = GTK_DIALOG (dialog)->action_area; + hbox = gtk_dialog_get_action_area(GTK_DIALOG (dialog)); button = gtk_button_new_with_label ("OK"); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) preview_options_ok_callback, dialog); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); @@ -1622,7 +1622,7 @@ pref_device_restore (void) static void pref_toggle_advanced (GtkWidget * widget, gpointer data) { - preferences.advanced = (GTK_CHECK_MENU_ITEM (widget)->active != 0); + preferences.advanced = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (widget)); gsg_set_advanced (dialog, preferences.advanced); pref_xscanimage_save (); } @@ -1630,7 +1630,7 @@ pref_toggle_advanced (GtkWidget * widget, gpointer data) static void pref_toggle_tooltips (GtkWidget * widget, gpointer data) { - preferences.tooltips_enabled = (GTK_CHECK_MENU_ITEM (widget)->active != 0); + preferences.tooltips_enabled = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (widget)); gsg_set_tooltips (dialog, preferences.tooltips_enabled); pref_xscanimage_save (); } @@ -1638,7 +1638,7 @@ pref_toggle_tooltips (GtkWidget * widget, gpointer data) static void pref_toggle_twocolumn (GtkWidget * widget, gpointer data) { - preferences.twocolumn_enabled = (GTK_CHECK_MENU_ITEM (widget)->active != 0); + preferences.twocolumn_enabled = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (widget)); gsg_set_twocolumn (dialog, preferences.twocolumn_enabled); pref_xscanimage_save (); } @@ -1807,7 +1807,7 @@ device_dialog (void) GTK_SIGNAL_FUNC (scan_win_delete), NULL); /* create the main vbox */ - vbox = GTK_DIALOG (scan_win.shell)->vbox; + vbox = gtk_dialog_get_content_area(GTK_DIALOG (scan_win.shell)); /* create the menubar */ @@ -1907,7 +1907,7 @@ device_dialog (void) update_param (dialog, 0); /* The bottom row of buttons */ - hbox = GTK_DIALOG (scan_win.shell)->action_area; + hbox = gtk_dialog_get_action_area(GTK_DIALOG (scan_win.shell)); /* The Scan button */ scan_win.scan_button = gtk_button_new_with_label ("Scan"); @@ -1977,7 +1977,7 @@ choose_device (void) gtk_signal_connect (GTK_OBJECT (choose_device_dialog), "delete_event", GTK_SIGNAL_FUNC (files_exit_callback), NULL); - main_vbox = GTK_DIALOG (choose_device_dialog)->vbox; + main_vbox = gtk_dialog_get_content_area(GTK_DIALOG (choose_device_dialog)); /* The list of drivers */ vbox = gtk_vbox_new (FALSE, 5); @@ -2003,11 +2003,11 @@ choose_device (void) } /* The bottom row of buttons */ - hbox = GTK_DIALOG (choose_device_dialog)->action_area; + hbox = gtk_dialog_get_action_area(GTK_DIALOG (choose_device_dialog)); /* The OK button */ button = gtk_button_new_with_label ("OK"); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) ok_choose_dialog_callback, NULL); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);