From 9a94231819bbfaf23e477dc27c3966903ebdf1e1 Mon Sep 17 00:00:00 2001 From: monsta Date: Mon, 21 Nov 2016 22:28:15 +0300 Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option and require libmate-desktop >= 1.17 --- src/eom-close-confirmation-dialog.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'src/eom-close-confirmation-dialog.c') diff --git a/src/eom-close-confirmation-dialog.c b/src/eom-close-confirmation-dialog.c index 2251fee..322e805 100644 --- a/src/eom-close-confirmation-dialog.c +++ b/src/eom-close-confirmation-dialog.c @@ -33,11 +33,6 @@ #include "eom-close-confirmation-dialog.h" #include -#if GTK_CHECK_VERSION (3, 2, 0) -#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) -#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) -#endif - /* Properties */ enum { @@ -399,11 +394,7 @@ build_single_img_dialog (EomCloseConfirmationDialog *dlg) /* Image */ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_valign (image, GTK_ALIGN_START); -#else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); -#endif /* Primary label */ primary_label = gtk_label_new (NULL); @@ -439,12 +430,12 @@ build_single_img_dialog (EomCloseConfirmationDialog *dlg) #endif gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); @@ -595,7 +586,7 @@ build_multiple_imgs_dialog (EomCloseConfirmationDialog *dlg) priv = dlg->priv; - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), hbox, TRUE, TRUE, 0); @@ -603,14 +594,10 @@ build_multiple_imgs_dialog (EomCloseConfirmationDialog *dlg) /* Image */ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_valign (image, GTK_ALIGN_START); -#else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); -#endif gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); /* Primary label */ @@ -639,7 +626,7 @@ build_multiple_imgs_dialog (EomCloseConfirmationDialog *dlg) g_free (markup_str); gtk_box_pack_start (GTK_BOX (vbox), primary_label, FALSE, FALSE, 0); - vbox2 = gtk_vbox_new (FALSE, 8); + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); select_label = gtk_label_new_with_mnemonic (_("S_elect the images you want to save:")); -- cgit v1.2.1