diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-08-31 16:30:21 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-08-31 16:30:21 +0000 |
| commit | ccb447da02e641d21cbde3329168dd0bfc9b4e24 (patch) | |
| tree | a2dddb413e882d5028abe1e255071d7e1be224b8 /gtk/gtkpagesetupunixdialog.c | |
| parent | 4580e71250e42ea53bdceb6b14b4f63c39ae8842 (diff) | |
| parent | 76b5ff6a0030d2d72614b7268354c6a745bc3504 (diff) | |
| download | gtk+-ccb447da02e641d21cbde3329168dd0bfc9b4e24.tar.gz | |
Merge branch 'wip/baedert/for-master' into 'master'
Wip/baedert/for master
Closes #2777
See merge request GNOME/gtk!2503
Diffstat (limited to 'gtk/gtkpagesetupunixdialog.c')
| -rw-r--r-- | gtk/gtkpagesetupunixdialog.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index ed8135eb34..4fe2a03191 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -26,8 +26,7 @@ #include "gtkbutton.h" #include "gtkscrolledwindow.h" -#include "gtktogglebutton.h" -#include "gtkradiobutton.h" +#include "gtkcheckbutton.h" #include "gtklabel.h" #include "gtkgrid.h" #include "gtkcelllayout.h" @@ -795,11 +794,11 @@ gtk_page_setup_unix_dialog_new (const char *title, static GtkPageOrientation get_orientation (GtkPageSetupUnixDialog *dialog) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->portrait_radio))) + if (gtk_check_button_get_active (GTK_CHECK_BUTTON (dialog->portrait_radio))) return GTK_PAGE_ORIENTATION_PORTRAIT; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->landscape_radio))) + if (gtk_check_button_get_active (GTK_CHECK_BUTTON (dialog->landscape_radio))) return GTK_PAGE_ORIENTATION_LANDSCAPE; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->reverse_landscape_radio))) + if (gtk_check_button_get_active (GTK_CHECK_BUTTON (dialog->reverse_landscape_radio))) return GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE; return GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT; } @@ -811,16 +810,16 @@ set_orientation (GtkPageSetupUnixDialog *dialog, switch (orientation) { case GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->reverse_portrait_radio), TRUE); + gtk_check_button_set_active (GTK_CHECK_BUTTON (dialog->reverse_portrait_radio), TRUE); break; case GTK_PAGE_ORIENTATION_PORTRAIT: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->portrait_radio), TRUE); + gtk_check_button_set_active (GTK_CHECK_BUTTON (dialog->portrait_radio), TRUE); break; case GTK_PAGE_ORIENTATION_LANDSCAPE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->landscape_radio), TRUE); + gtk_check_button_set_active (GTK_CHECK_BUTTON (dialog->landscape_radio), TRUE); break; case GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->reverse_landscape_radio), TRUE); + gtk_check_button_set_active (GTK_CHECK_BUTTON (dialog->reverse_landscape_radio), TRUE); break; default: break; |