Merge branch 'lb90/for-main' into 'main'

For main

Closes #7075

See merge request GNOME/gtk!7898

gdk/gdkconfig.h.win32

@@ -1,22 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.ac'
- */
-
-#ifndef __GDKCONFIG_H__
-#define __GDKCONFIG_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-
-#define GDK_WINDOWING_WIN32
-
-G_END_DECLS
-
-#endif  /* __GDKCONFIG_H__ */

gdk/gdkconfig.h.win32_vulkan

@@ -1,23 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.ac'
- */
-
-#ifndef __GDKCONFIG_H__
-#define __GDKCONFIG_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-
-#define GDK_WINDOWING_WIN32
-#define GDK_RENDERING_VULKAN
-
-G_END_DECLS
-
-#endif  /* __GDKCONFIG_H__ */

gdk/win32/gdkdisplay-win32.c

@@ -656,25 +656,17 @@ gdk_win32_display_get_name (GdkDisplay *display)
 static void
 gdk_win32_display_beep (GdkDisplay *display)
 {
-  g_return_if_fail (display == gdk_display_get_default());
-  if (!MessageBeep (-1))
-    Beep(1000, 50);
+  MessageBeep ((UINT)-1);
 }
 
 static void
 gdk_win32_display_flush (GdkDisplay * display)
 {
-  g_return_if_fail (display == gdk_display_get_default());
-
-  GdiFlush ();
 }
 
 static void
 gdk_win32_display_sync (GdkDisplay * display)
 {
-  g_return_if_fail (display == gdk_display_get_default());
-
-  GdiFlush ();
 }
 
 static void

gdk/win32/gdkevents-win32.c

@@ -3078,7 +3078,12 @@ gdk_event_translate (MSG *msg,
 
       /* Call modal timer immediate so that we repaint faster after a resize. */
       if (GDK_WIN32_DISPLAY (gdk_surface_get_display (surface))->display_surface_record->modal_operation_in_progress & GDK_WIN32_MODAL_OP_SIZEMOVE_MASK)
-	modal_timer_proc (0,0,0,0);
+        {
+          modal_timer_proc (msg->hwnd,
+                            msg->message,
+                            (UINT_PTR)surface,
+                            msg->time);
+        }
 
       /* Claim as handled, so that WM_SIZE and WM_MOVE are avoided */
       return_val = TRUE;

tools/gtk-builder-tool.c

@@ -46,7 +46,7 @@ usage (void)
              "  render       Take a screenshot of the file\n"
              "  screenshot   Take a screenshot of the file\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput

tools/gtk-image-tool.c

@@ -45,7 +45,7 @@ usage (void)
              "  relabel      Change the color state of the image without conversion\n"
              "  show         Show the image\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput

tools/gtk-path-tool.c

@@ -45,7 +45,7 @@ usage (void)
              "  render       Render the path as an image\n"
              "  info         Print information about the path\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput

tools/gtk-rendernode-tool.c

@@ -45,7 +45,7 @@ usage (void)
              "  show         Show the node\n"
              "  render       Take a screenshot of the node\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput