From 296b0562f1f9c8c65f1578fc36fb57f1d435238d Mon Sep 17 00:00:00 2001 From: Sorokin Alexei Date: Fri, 24 Jun 2016 22:25:51 +0300 Subject: use gtk_box_new instead of gtk_{h,v}box_new properly --- src/copy-theme-dialog.c | 13 +++++++------ src/gs-lock-plug.c | 20 ++++++++++---------- src/gs-window-x11.c | 12 ++++++------ 3 files changed, 23 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/copy-theme-dialog.c b/src/copy-theme-dialog.c index 0fd64f2..14794a0 100644 --- a/src/copy-theme-dialog.c +++ b/src/copy-theme-dialog.c @@ -31,9 +31,9 @@ #include "copy-theme-dialog.h" -#if GTK_CHECK_VERSION (3, 0, 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) +#if !GTK_CHECK_VERSION (3, 0, 0) +#define gtk_box_new(GTK_ORIENTATION_HORIZONTAL, b) gtk_hbox_new(FALSE, b) +#define gtk_box_new(GTK_ORIENTATION_VERTICAL, b) gtk_vbox_new(FALSE, b) #endif static void @@ -212,7 +212,7 @@ copy_theme_dialog_init (CopyThemeDialog *dlg) 4); gtk_box_set_spacing (GTK_BOX (dialog_vbox), 4); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0); @@ -230,7 +230,7 @@ copy_theme_dialog_init (CopyThemeDialog *dlg) gtk_box_pack_start (GTK_BOX (vbox), dlg->priv->status, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); table = gtk_table_new (2, 2, FALSE); @@ -248,7 +248,8 @@ copy_theme_dialog_init (CopyThemeDialog *dlg) gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, FALSE, 0); - progress_vbox = gtk_vbox_new (TRUE, 0); + progress_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (progress_vbox, TRUE); gtk_box_pack_start (GTK_BOX (vbox), progress_vbox, FALSE, FALSE, 0); dlg->priv->progress = gtk_progress_bar_new (); diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c index 2893714..7dea3c3 100644 --- a/src/gs-lock-plug.c +++ b/src/gs-lock-plug.c @@ -82,9 +82,9 @@ static void gs_lock_plug_finalize (GObject *object); #define GS_LOCK_PLUG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_LOCK_PLUG, GSLockPlugPrivate)) -#if GTK_CHECK_VERSION (3, 0, 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) +#if !GTK_CHECK_VERSION (3, 0, 0) +#define gtk_box_new(GTK_ORIENTATION_HORIZONTAL, b) gtk_hbox_new(FALSE, b) +#define gtk_box_new(GTK_ORIENTATION_VERTICAL, b) gtk_vbox_new(FALSE, b) #endif #if !GTK_CHECK_VERSION (3, 20, 0) @@ -1955,7 +1955,7 @@ create_page_one (GSLockPlug *plug) gs_profile_start ("page one"); #if GTK_CHECK_VERSION(3, 0, 0) - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_widget_set_halign (GTK_WIDGET (vbox), GTK_ALIGN_CENTER); gtk_widget_set_valign (GTK_WIDGET (vbox), @@ -1966,11 +1966,11 @@ create_page_one (GSLockPlug *plug) align = gtk_alignment_new (0.5, 0.5, 1, 1); gtk_notebook_append_page (GTK_NOTEBOOK (plug->priv->notebook), align, NULL); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_add (GTK_CONTAINER (align), vbox); #endif - vbox2 = gtk_vbox_new (FALSE, 0); + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); str = g_strdup ("%s"); @@ -2006,7 +2006,7 @@ create_page_one (GSLockPlug *plug) gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_face_image), 0.5, 1.0); #endif - vbox2 = gtk_vbox_new (FALSE, 0); + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); str = g_strdup ("%R"); @@ -2036,10 +2036,10 @@ create_page_one (GSLockPlug *plug) gtk_label_set_use_markup (GTK_LABEL (plug->priv->auth_username_label), TRUE); gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_username_label, FALSE, FALSE, 0); - vbox2 = gtk_vbox_new (FALSE, 0); + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); plug->priv->auth_prompt_label = gtk_label_new_with_mnemonic (_("_Password:")); @@ -2294,7 +2294,7 @@ gs_lock_plug_init (GSLockPlug *plug) { gs_debug ("Unable to load theme!"); - plug->priv->vbox = gtk_vbox_new (FALSE, 0); + plug->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (plug), plug->priv->vbox); diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c index e49cbd4..6861508 100644 --- a/src/gs-window-x11.c +++ b/src/gs-window-x11.c @@ -62,9 +62,9 @@ enum #define GS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_WINDOW, GSWindowPrivate)) -#if GTK_CHECK_VERSION (3, 0, 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) +#if !GTK_CHECK_VERSION (3, 0, 0) +#define gtk_box_new(GTK_ORIENTATION_HORIZONTAL, b) gtk_hbox_new(FALSE, b) +#define gtk_box_new(GTK_ORIENTATION_VERTICAL, b) gtk_vbox_new(FALSE, b) #endif struct GSWindowPrivate @@ -1120,7 +1120,7 @@ set_info_text_and_icon (GSWindow *window, GtkWidget *primary_label; GtkWidget *secondary_label; - hbox_content = gtk_hbox_new (FALSE, 8); + hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_widget_show (hbox_content); image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG); @@ -1132,7 +1132,7 @@ set_info_text_and_icon (GSWindow *window, gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); #endif - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (hbox_content), vbox, FALSE, FALSE, 0); @@ -2799,7 +2799,7 @@ gs_window_init (GSWindow *window) | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); - window->priv->vbox = gtk_vbox_new (FALSE, 12); + window->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_widget_show (window->priv->vbox); gtk_container_add (GTK_CONTAINER (window), window->priv->vbox); -- cgit v1.2.1