Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request GNOME/gtk!2077

demos/icon-browser/iconbrowser.gresource.xml

@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/org/gtk/iconbrowser/gtk">
     <file preprocess="xml-stripblanks">window.ui</file>
-    <file preprocess="xml-stripblanks">menus.ui</file>
     <file>icon.list</file>
   </gresource>
 </gresources>

demos/icon-browser/menus.ui

@@ -1,10 +0,0 @@
-<interface>
-  <menu id="app-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>

gtk/gtkdropdown.c

@@ -396,6 +396,8 @@ gtk_drop_down_size_allocate (GtkWidget *widget,
 
   gtk_widget_size_allocate (self->button, &(GtkAllocation) { 0, 0, width, height }, baseline);
 
+  gtk_widget_set_size_request (self->popup, width, -1);
+
   gtk_native_check_resize (GTK_NATIVE (self->popup));
 }
 

gtk/gtkpagesetupunixdialog.c

@@ -53,11 +53,9 @@
  *
  * #GtkPageSetupUnixDialog implements a page setup dialog for platforms
  * which don’t provide a native page setup dialog, like Unix. It can
- * be used very much like any other GTK+ dialog, at the cost of
+ * be used very much like any other GTK dialog, at the cost of
  * the portability offered by the
  * [high-level printing API][gtk3-High-level-Printing-API]
- *
- * Printing support was added in GTK+ 2.10.
  */
 
 typedef struct _GtkPageSetupUnixDialogClass    GtkPageSetupUnixDialogClass;

gtk/gtkprintunixdialog.c

@@ -65,7 +65,7 @@
  *
  * GtkPrintUnixDialog implements a print dialog for platforms
  * which don’t provide a native print dialog, like Unix. It can
- * be used very much like any other GTK+ dialog, at the cost of
+ * be used very much like any other GTK dialog, at the cost of
  * the portability offered by the
  * [high-level printing API][gtk3-High-level-Printing-API]
  *
@@ -79,8 +79,6 @@
  * - %GTK_RESPONSE_APPLY: for the “Preview” button
  * - %GTK_RESPONSE_CANCEL: for the “Cancel” button
  *
- * Printing support was added in GTK+ 2.10.
- *
  * # GtkPrintUnixDialog as GtkBuildable
  *
  * The GtkPrintUnixDialog implementation of the GtkBuildable interface exposes its

gtk/theme/Adwaita/_common.scss

@@ -1145,6 +1145,7 @@ spinbutton {
 /**************
  * ComboBoxes *
  **************/
+dropdown,
 combobox {
   arrow {
     -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');