Bug 1288702: Firefox updater: Replace |GtkVBox| by |GtkBox| on Gtk+3 r?karlt draft
authorThomas Zimmermann <tdz@users.sourceforge.net>
Fri, 22 Jul 2016 13:38:38 +0200
changeset 391306 bf8bfe1bd2a84e1d42660a6540885a96989d08ed
parent 391305 e0bc88708ffed39aaab1fbc0ac461d93561195de
child 526183 9916ccdc0db8c881ee6cce518a73393f1d77ee2e
push id23865
push usertdz@users.sourceforge.net
push dateFri, 22 Jul 2016 11:39:16 +0000
reviewerskarlt
bugs1288702
milestone50.0a1
Bug 1288702: Firefox updater: Replace |GtkVBox| by |GtkBox| on Gtk+3 r?karlt MozReview-Commit-ID: 1pb4pXbyFHW
toolkit/mozapps/update/updater/progressui_gtk.cpp
--- a/toolkit/mozapps/update/updater/progressui_gtk.cpp
+++ b/toolkit/mozapps/update/updater/progressui_gtk.cpp
@@ -93,17 +93,23 @@ ShowProgressUI()
   gtk_window_set_position(GTK_WINDOW(sWin), GTK_WIN_POS_CENTER_ALWAYS);
   gtk_window_set_resizable(GTK_WINDOW(sWin), FALSE);
   gtk_window_set_decorated(GTK_WINDOW(sWin), TRUE);
   gtk_window_set_deletable(GTK_WINDOW(sWin),FALSE);
   pixbuf = gdk_pixbuf_new_from_file (icon_path, nullptr);
   gtk_window_set_icon(GTK_WINDOW(sWin), pixbuf);
   g_object_unref(pixbuf);
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+  GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_set_homogeneous(GTK_BOX(vbox), TRUE);
+#else
   GtkWidget *vbox = gtk_vbox_new(TRUE, 6);
+#endif
+
   sLabel = gtk_label_new(strings.info);
   gtk_misc_set_alignment(GTK_MISC(sLabel), 0.0f, 0.0f);
   sProgressBar = gtk_progress_bar_new();
 
   gtk_box_pack_start(GTK_BOX(vbox), sLabel, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), sProgressBar, TRUE, TRUE, 0);
 
   sTimerID = g_timeout_add(TIMER_INTERVAL, UpdateDialog, nullptr);