[gtk/present-toplevel-2] more win32 build fixes
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/present-toplevel-2] more win32 build fixes
- Date: Thu, 12 Mar 2020 23:54:25 +0000 (UTC)
commit 2fbea31ac1f419b8799f0cbb86ced1c5a40213f6
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Mar 12 19:53:29 2020 -0400
more win32 build fixes
gdk/win32/gdksurface-win32.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index f16dd2a2f8..6fbf8ebd09 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -214,7 +214,7 @@ _gdk_win32_get_window_client_area_rect (GdkSurface *window,
{
gint x, y, width, height;
- gdk_surface_get_position (window, &x, &y);
+ x = y = 0;
width = gdk_surface_get_width (window);
height = gdk_surface_get_height (window);
rect->left = x * scale;
@@ -702,13 +702,13 @@ gdk_win32_surface_destroy (GdkSurface *window,
while (surface->transient_children != NULL)
{
GdkSurface *child = surface->transient_children->data;
- gdk_surface_set_transient_for (child, NULL);
+ gdk_win32_surface_set_transient_for (child, NULL);
}
/* Remove ourself from our transient owner */
if (surface->transient_owner != NULL)
{
- gdk_surface_set_transient_for (window, NULL);
+ gdk_win32_surface_set_transient_for (window, NULL);
}
if (!foreign_destroy)
@@ -1017,7 +1017,7 @@ show_window_internal (GdkSurface *window,
if (window->state & GDK_SURFACE_STATE_FULLSCREEN)
{
- gdk_surface_fullscreen (window);
+ gdk_win32_surface_fullscreen (window);
}
else if (window->state & GDK_SURFACE_STATE_MAXIMIZED)
{
@@ -1152,7 +1152,7 @@ gdk_win32_surface_do_move (GdkSurface *window,
SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER));
}
-static void
+void
gdk_win32_surface_resize (GdkSurface *window,
gint width, gint height)
{
@@ -1460,10 +1460,9 @@ get_effective_window_decorations (GdkSurface *window,
{
GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
- if (gdk_surface_get_decorations (window, decoration))
- return TRUE;
+ *decoration = 0;
- if (window->surface_type != GDK_SURFACE_TOPLEVEL)
+ if (!GDK_IS_TOPLEVEL (window))
{
return FALSE;
}
@@ -2538,7 +2537,7 @@ snap_up (GdkSurface *window)
stash_window (window, impl);
maxysize = GetSystemMetrics (SM_CYVIRTUALSCREEN) / impl->surface_scale;
- gdk_surface_get_position (window, &x, &y);
+ x = y = 0;
width = gdk_surface_get_width (window);
y = 0;
@@ -3219,7 +3218,7 @@ update_fullup_indicator (GdkSurface *window,
impl = GDK_WIN32_SURFACE (window);
maxysize = GetSystemMetrics (SM_CYVIRTUALSCREEN);
- gdk_surface_get_position (window, &to.x, &to.y);
+ to.x = to.y = 0;
to.width = gdk_surface_get_width (window);
to.height = gdk_surface_get_height (window);
@@ -3344,7 +3343,7 @@ start_indicator (GdkSurface *window,
gdk_monitor_get_workarea (monitor, &workarea);
maxysize = GetSystemMetrics (SM_CYVIRTUALSCREEN) / impl->surface_scale;
- gdk_surface_get_position (window, &start_size.x, &start_size.y);
+ start_size.x = start_size.y = 0;
start_size.width = gdk_surface_get_width (window);
start_size.height = gdk_surface_get_height (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]