treeview: Make the multipress gesture listen only to bin_window

This gesture is meant to handle row-activated signaling, so make the
gesture ignore events from any other window.

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [13])
-m4_define([gtk_micro_version], [2])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -1888,7 +1888,6 @@ gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/inspector/Makefile
 gtk/native/Makefile
-util/Makefile
 libgail-util/Makefile
 modules/Makefile
 modules/input/Makefile

docs/reference/gdk/gdk3-sections.txt

@@ -389,7 +389,6 @@ gdk_window_begin_resize_drag
 gdk_window_begin_resize_drag_for_device
 gdk_window_begin_move_drag
 gdk_window_begin_move_drag_for_device
-gdk_window_show_window_menu
 gdk_window_constrain_size
 gdk_window_beep
 gdk_window_get_scale_factor

docs/reference/gtk/gtk3-sections.txt

@@ -2615,8 +2615,6 @@ gtk_places_sidebar_get_show_connect_to_server
 gtk_places_sidebar_set_show_connect_to_server
 gtk_places_sidebar_get_local_only
 gtk_places_sidebar_set_local_only
-gtk_places_sidebar_get_show_enter_location
-gtk_places_sidebar_set_show_enter_location
 <SUBSECTION Standard>
 GTK_PLACES_SIDEBAR
 GTK_IS_PLACES_SIDEBAR
@@ -3246,8 +3244,6 @@ gtk_settings_set_property_value
 gtk_settings_set_string_property
 gtk_settings_set_long_property
 gtk_settings_set_double_property
-GtkIMPreeditStyle
-GtkIMStatusStyle
 <SUBSECTION Standard>
 GtkSettingsClass
 GTK_IS_SETTINGS
@@ -5491,7 +5487,6 @@ gtk_widget_get_has_window
 gtk_widget_set_has_window
 gtk_widget_get_sensitive
 gtk_widget_is_sensitive
-GtkStateType
 gtk_widget_get_state
 gtk_widget_get_visible
 gtk_widget_is_visible
@@ -6532,6 +6527,8 @@ gtk_binding_set_add_path
 GtkBaselinePosition
 GtkDeleteType
 GtkDirectionType
+GtkIMPreeditStyle
+GtkIMStatusStyle
 GtkJustification
 GtkMovementStep
 GtkOrientation
@@ -6542,6 +6539,7 @@ GtkScrollStep
 GtkScrollType
 GtkSelectionMode
 GtkShadowType
+GtkStateType
 GtkStateFlags
 GtkToolbarStyle
 GtkSortType
@@ -7803,8 +7801,6 @@ GtkStackTransitionType
 gtk_stack_set_transition_type
 gtk_stack_get_transition_type
 gtk_stack_get_transition_running
-<SUBSECTION Private>
-gtk_stack_get_type
 </SECTION>
 
 <SECTION>
@@ -7814,8 +7810,6 @@ GtkStackSwitcher
 gtk_stack_switcher_new
 gtk_stack_switcher_set_stack
 gtk_stack_switcher_get_stack
-<SUBSECTION Private>
-gtk_stack_switcher_get_type
 </SECTION>
 
 <SECTION>
@@ -7832,8 +7826,6 @@ gtk_revealer_set_transition_duration
 GtkRevealerTransitionType
 gtk_revealer_get_transition_type
 gtk_revealer_set_transition_type
-<SUBSECTION Private>
-gtk_revealer_get_type
 </SECTION>
 
 <SECTION>
@@ -8054,6 +8046,7 @@ gtk_gesture_multi_press_get_type
 <TITLE>GtkGesturePan</TITLE>
 GtkGesturePan
 GtkPanDirection
+GtkPanOrientation
 gtk_gesture_pan_new
 gtk_gesture_pan_get_orientation
 gtk_gesture_pan_set_orientation

docs/reference/gtk/input-handling.xml

@@ -91,7 +91,7 @@
     <para>
       The event is then propagated from the toplevel window down to the 
       target widget. In this phase, which is known as the “capture” phase,
-      gestures that are attached with GTK_PHASE_CAPTURE get a chance
+      gestures that are attached with %GTK_PHASE_CAPTURE get a chance
       to react to the event.
     </para>
 
@@ -101,12 +101,12 @@
       way to handle input in GTK+ widgets before gestures were introduced.
       The signals are emitted from the target widget up to the toplevel,
       until a signal handler indicates that it has handled the event, by
-      returning GDK_EVENT_STOP.
+      returning %GDK_EVENT_STOP.
     </para>
 
     <para>
       The default handlers for the event signals send the event
-      to gestures that are attached with GTK_PHASE_TARGET. Therefore,
+      to gestures that are attached with %GTK_PHASE_TARGET. Therefore,
       gestures in the ”target” phase are only used if the widget does
       not have its own event handlers, or takes care to chain up to the
       default handlers.
@@ -114,7 +114,7 @@
 
     <para>
       After calling the event handlers, in the so-called ”bubble” phase,
-      gestures that are attached with GTK_PHASE_BUBBLE get a chance
+      gestures that are attached with %GTK_PHASE_BUBBLE get a chance
       to react to the event.
     </para>
 

gdk/wayland/gdkdevice-wayland.c

@@ -1129,7 +1129,7 @@ deliver_key_event (GdkWaylandDeviceData *device,
   event->key.window = device->keyboard_focus ? g_object_ref (device->keyboard_focus) : NULL;
   gdk_event_set_device (event, device->master_keyboard);
   gdk_event_set_source_device (event, device->keyboard);
-  event->key.time = time_;
+  event->button.time = time_;
   event->key.state = device->modifiers;
   event->key.group = 0;
   event->key.hardware_keycode = key;

gdk/wayland/gdkwindow-wayland.c

@@ -47,6 +47,14 @@
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
 
+/* Return whether time1 is considered later than time2 as far as xserver
+ * time is concerned.  Accounts for wraparound.
+ */
+#define XSERVER_TIME_IS_LATER(time1, time2)                        \
+  ( (( time1 > time2 ) && ( time1 - time2 < ((guint32)-1)/2 )) ||  \
+    (( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 ))     \
+  )
+
 typedef struct _GdkWaylandWindow GdkWaylandWindow;
 typedef struct _GdkWaylandWindowClass GdkWaylandWindowClass;
 

gtk/Makefile.am

@@ -1321,9 +1321,9 @@ COMPOSITE_TEMPLATES =				\
 
 template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
 
-%.ui.h: %.ui
+%.ui.h: %.ui extract-strings$(BUILD_EXEEXT)
 	$(AM_V_GEN) mkdir -p $(dir $@) \
-	&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
+	&& ./extract-strings$(BUILD_EXEEXT) $< > $@
 
 #
 # rules to generate built sources
@@ -1616,6 +1616,17 @@ endif
 gtk_launch_LDADD = $(LDADDS)
 gtk_launch_SOURCES = gtk-launch.c
 
+# The extract_strings tool is a build utility that runs on the build system.
+extract_strings_sources = extract-strings.c
+extract_strings_cppflags =
+extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
+extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
+extract-strings$(BUILD_EXEEXT): $(extract_strings_sources)
+	@rm -f extract-strings$(BUILD_EXEEXT)
+	$(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
+EXTRA_DIST += $(extract_strings_sources)
+DISTCLEANFILES += extract-strings
+
 .PHONY: files test test-debug
 
 files:

gtk/gtkenums.h

@@ -497,9 +497,6 @@ typedef enum
  * the widget is drawn. The #GtkStateType enumeration is also used to
  * identify different colors in a #GtkStyle for drawing, so states can be
  * used for subparts of a widget as well as entire widgets.
- *
- * Deprecated: 3.14: All APIs that are using this enumeration have been deprecated
- *     in favor of alternatives using #GtkStateFlags.
  */
 typedef enum
 {

gtk/gtkeventcontroller.c

@@ -115,8 +115,8 @@ gtk_event_controller_constructed (GObject *object)
   GtkEventControllerPrivate *priv;
 
   priv = gtk_event_controller_get_instance_private (controller);
-  if (priv->widget)
-    _gtk_widget_add_controller (priv->widget, controller);
+  g_assert (priv->widget != NULL);
+  _gtk_widget_add_controller (priv->widget, controller);
 }
 
 static void
@@ -126,8 +126,7 @@ gtk_event_controller_dispose (GObject *object)
   GtkEventControllerPrivate *priv;
 
   priv = gtk_event_controller_get_instance_private (controller);
-  if (priv->widget)
-    _gtk_widget_remove_controller (priv->widget, controller);
+  _gtk_widget_remove_controller (priv->widget, controller);
 }
 
 static void

gtk/gtkgesturedrag.c

@@ -186,8 +186,6 @@ gtk_gesture_drag_init (GtkGestureDrag *gesture)
 GtkGesture *
 gtk_gesture_drag_new (GtkWidget *widget)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_DRAG,
                        "widget", widget,
                        NULL);

gtk/gtkgesturelongpress.c

@@ -262,8 +262,6 @@ gtk_gesture_long_press_class_init (GtkGestureLongPressClass *klass)
 GtkGesture *
 gtk_gesture_long_press_new (GtkWidget *widget)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_LONG_PRESS,
                        "widget", widget,
                        NULL);

gtk/gtkgesturemultipress.c

@@ -384,8 +384,6 @@ gtk_gesture_multi_press_init (GtkGestureMultiPress *gesture)
 GtkGesture *
 gtk_gesture_multi_press_new (GtkWidget *widget)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_MULTI_PRESS,
                        "widget", widget,
                        NULL);

gtk/gtkgesturerotate.c

@@ -188,8 +188,6 @@ gtk_gesture_rotate_class_init (GtkGestureRotateClass *klass)
 GtkGesture *
 gtk_gesture_rotate_new (GtkWidget *widget)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_ROTATE,
                        "widget", widget,
                        NULL);
@@ -200,8 +198,7 @@ gtk_gesture_rotate_new (GtkWidget *widget)
  * @gesture: a #GtkGestureRotate
  *
  * If @gesture is active, this function returns the angle difference
- * in radians since the gesture was first recognized. If @gesture is
- * not active, 0 is returned.
+ * in radians since the gesture was first recognized.
  *
  * Returns: the angle delta in radians
  *
@@ -213,10 +210,10 @@ gtk_gesture_rotate_get_angle_delta (GtkGestureRotate *gesture)
   GtkGestureRotatePrivate *priv;
   gdouble angle;
 
-  g_return_val_if_fail (GTK_IS_GESTURE_ROTATE (gesture), 0.0);
+  g_return_val_if_fail (GTK_IS_GESTURE_ROTATE (gesture), FALSE);
 
   if (!_gtk_gesture_rotate_get_angle (gesture, &angle))
-    return 0.0;
+    return 0;
 
   priv = gtk_gesture_rotate_get_instance_private (gesture);
 

gtk/gtkgestureswipe.c

@@ -237,8 +237,6 @@ gtk_gesture_swipe_init (GtkGestureSwipe *gesture)
 GtkGesture *
 gtk_gesture_swipe_new (GtkWidget *widget)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_SWIPE,
                        "widget", widget,
                        NULL);

gtk/gtkgesturezoom.c

@@ -181,8 +181,6 @@ gtk_gesture_zoom_class_init (GtkGestureZoomClass *klass)
 GtkGesture *
 gtk_gesture_zoom_new (GtkWidget *widget)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_ZOOM,
                        "widget", widget,
                        NULL);
@@ -191,12 +189,13 @@ gtk_gesture_zoom_new (GtkWidget *widget)
 /**
  * gtk_gesture_zoom_get_scale_delta:
  * @gesture: a #GtkGestureZoom
+ * @scale: (out) (transfer none): zoom delta
  *
  * If @gesture is active, this function returns the zooming difference
  * since the gesture was recognized (hence the starting point is
  * considered 1:1). If @gesture is not active, 1 is returned.
  *
- * Returns: the scale delta
+ * Returns: %TRUE if @controller is recognizing a zoom gesture
  *
  * Since: 3.14
  **/
@@ -206,10 +205,10 @@ gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture)
   GtkGestureZoomPrivate *priv;
   gdouble distance;
 
-  g_return_val_if_fail (GTK_IS_GESTURE_ZOOM (gesture), 1.0);
+  g_return_val_if_fail (GTK_IS_GESTURE_ZOOM (gesture), FALSE);
 
   if (!_gtk_gesture_zoom_get_distance (gesture, &distance))
-    return 1.0;
+    return 1;
 
   priv = gtk_gesture_zoom_get_instance_private (gesture);
 

gtk/gtkimage.c

@@ -1522,12 +1522,12 @@ gtk_image_get_preferred_size (GtkImage *image,
   gint width, height;
   GtkBorder border;
   GtkStyleContext *context;
+  GtkStateFlags state;
 
   context = gtk_widget_get_style_context (GTK_WIDGET (image));
+  state = gtk_widget_get_state_flags (GTK_WIDGET (image));
+  gtk_style_context_get_border (context, state, &border);
   _gtk_icon_helper_get_size (priv->icon_helper, context, &width, &height);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  _gtk_misc_get_padding_and_border (GTK_MISC (image), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   width += border.left + border.right;
   height += border.top + border.bottom;
@@ -1560,6 +1560,60 @@ gtk_image_get_baseline_align (GtkImage *image)
   return image->priv->baseline_align;
 }
 
+static gfloat
+halign_to_float (GtkWidget *widget)
+{
+  gfloat ret = 0.5;
+
+  switch (gtk_widget_get_halign (widget))
+    {
+    case GTK_ALIGN_FILL:
+    case GTK_ALIGN_CENTER:
+      ret = 0.5;
+      break;
+    case GTK_ALIGN_START:
+      ret = 0.0;
+      break;
+    case GTK_ALIGN_END:
+      ret = 1.0;
+      break;
+    case GTK_ALIGN_BASELINE:
+      ret = 0.0;
+      g_assert_not_reached ();
+      break;
+    }
+
+  if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
+    ret = 1.0 - ret;
+
+  return ret;
+}
+
+static gfloat
+valign_to_float (GtkWidget *widget)
+{
+  gfloat ret = 0.5;
+
+  switch (gtk_widget_get_valign (widget))
+    {
+    case GTK_ALIGN_FILL:
+    case GTK_ALIGN_CENTER:
+      ret = 0.5;
+      break;
+    case GTK_ALIGN_START:
+      ret = 0.0;
+      break;
+    case GTK_ALIGN_END:
+      ret = 1.0;
+      break;
+    case GTK_ALIGN_BASELINE:
+      ret = 0.0;
+      break;
+    }
+
+  return ret;
+}
+
 static gint
 gtk_image_draw (GtkWidget *widget,
                 cairo_t   *cr)
@@ -1569,14 +1623,17 @@ gtk_image_draw (GtkWidget *widget,
   GtkStyleContext *context;
   gint x, y, width, height, baseline;
   gfloat xalign, yalign;
+  GtkStateFlags state;
   GtkBorder border;
-
+   
   g_return_val_if_fail (GTK_IS_IMAGE (widget), FALSE);
 
   image = GTK_IMAGE (widget);
   priv = image->priv;
 
   context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (GTK_WIDGET (image));
+  gtk_style_context_get_border (context, state, &border);
 
   gtk_render_background (context, cr,
                          0, 0,
@@ -1585,14 +1642,10 @@ gtk_image_draw (GtkWidget *widget,
                     0, 0,
                     gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_misc_get_alignment (GTK_MISC (image), &xalign, &yalign);
-  _gtk_misc_get_padding_and_border (GTK_MISC (image), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
-  gtk_image_get_preferred_size (image, &width, &height);
+  xalign = halign_to_float (widget);
+  yalign = valign_to_float (widget);
 
-  if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
-    xalign = 1.0 - xalign;
+  gtk_image_get_preferred_size (image, &width, &height);
 
   baseline = gtk_widget_get_allocated_baseline (widget);
 

gtk/gtklabel.c

@@ -962,6 +962,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      G_MAXINT,
                                                      -1,
                                                      GTK_PARAM_READWRITE));
+
   /*
    * Key bindings
    */
@@ -3218,6 +3219,17 @@ gtk_label_get_measuring_layout (GtkLabel *   label,
   return copy;
 }
 
+static void
+gtk_label_get_border (GtkLabel *label, GtkBorder *border)
+{
+  GtkStyleContext *context;
+  GtkStateFlags state;
+
+  context = gtk_widget_get_style_context (GTK_WIDGET (label));
+  state = gtk_widget_get_state_flags (GTK_WIDGET (label));
+  gtk_style_context_get_border (context, state, border);
+}
+
 static void
 gtk_label_update_layout_width (GtkLabel *label)
 {
@@ -3232,9 +3244,7 @@ gtk_label_update_layout_width (GtkLabel *label)
       PangoRectangle logical;
       gint width, height;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+      gtk_label_get_border (label, &border);
 
       width = gtk_widget_get_allocated_width (GTK_WIDGET (label)) - border.left - border.right;
       height = gtk_widget_get_allocated_height (GTK_WIDGET (label)) - border.top - border.bottom;
@@ -3651,9 +3661,7 @@ gtk_label_get_preferred_size (GtkWidget      *widget,
   smallest_rect.width  = PANGO_PIXELS_CEIL (smallest_rect.width);
   smallest_rect.height = PANGO_PIXELS_CEIL (smallest_rect.height);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+  gtk_label_get_border (label, &border);
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
@@ -3757,9 +3765,7 @@ gtk_label_get_preferred_width_for_height (GtkWidget *widget,
     {
       GtkBorder border;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+      gtk_label_get_border (label, &border);
 
       if (priv->wrap)
         gtk_label_clear_layout (label);
@@ -3794,9 +3800,7 @@ gtk_label_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
     {
       GtkBorder border;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+      gtk_label_get_border (label, &border);
 
       if (priv->wrap)
         gtk_label_clear_layout (label);
@@ -3922,6 +3926,60 @@ gtk_label_style_updated (GtkWidget *widget)
     gtk_label_update_layout_attributes (label);
 }
 
+static gfloat
+halign_to_float (GtkWidget *widget)
+{
+  gfloat ret = 0.5;
+
+  switch (gtk_widget_get_halign (widget))
+    {
+    case GTK_ALIGN_FILL:
+    case GTK_ALIGN_CENTER:
+      ret = 0.5;
+      break;
+    case GTK_ALIGN_START:
+      ret = 0.0;
+      break;
+    case GTK_ALIGN_END:
+      ret = 1.0;
+      break;
+    case GTK_ALIGN_BASELINE:
+      ret = 0.0;
+      g_assert_not_reached ();
+      break;    
+    }
+
+  if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
+    ret = 1.0 - ret;
+
+  return ret;
+}
+
+static gfloat
+valign_to_float (GtkWidget *widget)
+{
+  gfloat ret = 0.5;
+
+  switch (gtk_widget_get_valign (widget))
+    {
+    case GTK_ALIGN_FILL:
+    case GTK_ALIGN_CENTER:
+      ret = 0.5;
+      break;
+    case GTK_ALIGN_START:
+      ret = 0.0;
+      break;
+    case GTK_ALIGN_END:
+      ret = 1.0;
+      break;
+    case GTK_ALIGN_BASELINE:
+      ret = 0.0;
+      break;    
+    }
+
+  return ret;
+}
+
 static void
 get_layout_location (GtkLabel  *label,
                      gint      *xp,
@@ -3940,13 +3998,10 @@ get_layout_location (GtkLabel  *label,
   widget = GTK_WIDGET (label);
   priv   = label->priv;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_misc_get_alignment (GTK_MISC (label), &xalign, &yalign);
-  _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+  gtk_label_get_border (label, &border);
 
-  if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
-    xalign = 1.0 - xalign;
+  xalign = halign_to_float (widget);
+  yalign = valign_to_float (widget);
 
   pango_layout_get_extents (priv->layout, NULL, &logical);
 

gtk/gtksettings.c

@@ -449,7 +449,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                              g_param_spec_string ("gtk-icon-theme-name",
                                                                   P_("Icon Theme Name"),
                                                                   P_("Name of icon theme to use"),
-                                                                  "Adwaita",
+                                                                  "hicolor",
                                                                   GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ICON_THEME_NAME);

gtk/gtkwidget.h

@@ -947,10 +947,10 @@ void                  gtk_widget_set_allocation         (GtkWidget     *widget,
                                                          const GtkAllocation *allocation);
 GDK_AVAILABLE_IN_3_14
 void                  gtk_widget_set_clip               (GtkWidget     *widget,
-                                                         const GtkAllocation *clip);
+                                                         const GtkAllocation *allocation);  
 GDK_AVAILABLE_IN_3_14
 void                  gtk_widget_get_clip               (GtkWidget     *widget,
-                                                         GtkAllocation *clip);
+                                                         GtkAllocation *allocation);  
 
 GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width & gtk_widget_get_preferred_height)
 

gtk/gtkwindow.c

@@ -6947,10 +6947,10 @@ update_border_windows (GtkWindow *window)
                                        region, 0, 0);
       cairo_region_destroy (region);
 
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST]);
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST]);
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST]);
     }
   else
     {
@@ -6982,8 +6982,8 @@ update_border_windows (GtkWindow *window)
                               x, window_border.top + height,
                               w, border.bottom);
 
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
     }
   else
     {
@@ -7014,8 +7014,8 @@ update_border_windows (GtkWindow *window)
                               window_border.left + width, y,
                               border.right, h);
 
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_WEST]);
-      gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_EAST]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_WEST]);
+      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_EAST]);
     }
   else
     {

gtk/inspector/Makefile.am

@@ -6,14 +6,13 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --gener
 resources.h: inspector.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/inspector.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --c-name gtk_inspector --generate-header --manual-register
-resources.c: inspector.gresource.xml $(resource_files)
+resources.c: inspector.gresource.xml $(resource_files) $(template_headers)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/inspector.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --c-name gtk_inspector --generate-source --manual-register
 
 BUILT_SOURCES = 			\
 	resources.h			\
-	resources.c			\
-	$(template_headers)
+	resources.c
 
 libgtkinspector_la_SOURCES = 		\
 	actions.h			\
@@ -99,9 +98,11 @@ templates = 				\
 
 template_headers = $(templates:.ui=.ui.h)
 
-extract_strings = $(top_builddir)/util/extract-strings
+BUILT_SOURCES += $(template_headers)
 
-%.ui.h : %.ui 
+extract_strings = $(top_builddir)/gtk/extract-strings$(BUILD_EXEEXT)
+
+%.ui.h: %.ui $(extract_strings)
 	$(AM_V_GEN) $(extract_strings) $< > $@
 
 EXTRA_DIST += 				\
@@ -109,14 +110,4 @@ EXTRA_DIST += 				\
 	$(resource_files) 		\
 	$(templates)
 
-MAINTAINERCLEANFILES =			\
-	resources.c			\
-	resources.h			\
-	$(template_headers)
-
-distclean-local:
-	if test $(srcdir) != .; then \
-	  rm -f $(MAINTAINERCLEANFILES); \
-	fi
-
 -include $(top_srcdir)/git.mk

util/Makefile.am

@@ -1,11 +0,0 @@
-# The extract_strings tool is a build utility that runs on the build system.
-extract_strings_sources = extract-strings.c
-extract_strings_cppflags =
-extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
-extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
-
-extract-strings: $(extract_strings_sources)
-	@rm -f extract-strings
-	$(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
-
-noinst_PROGRAMS = extract-strings