[gtk/wip/matthiasc/popup5: 147/151] GDK W32: No more child windows
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup5: 147/151] GDK W32: No more child windows
- Date: Tue, 28 May 2019 20:41:02 +0000 (UTC)
commit 493b30c2a83c95cac1669d842132b53f0b1b543e
Author: РуÑлан Ижбулатов <lrn1986 gmail com>
Date: Tue May 28 16:37:28 2019 +0000
GDK W32: No more child windows
We don't have child windows (the window-inside-a-window kind of windows)
anymore. Remove all the code related to that.
gdk/win32/gdkgeometry-win32.c | 155 ------------------------------------------
gdk/win32/gdksurface-win32.c | 23 +------
gdk/win32/gdksurface-win32.h | 9 ---
gdk/win32/meson.build | 1 -
4 files changed, 1 insertion(+), 187 deletions(-)
---
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 5ccc7525e9..07fe55b35b 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -268,7 +268,7 @@ _gdk_win32_surface_enable_transparency (GdkSurface *window)
DWM_BLURBEHIND blur_behind;
HRGN empty_region;
HRESULT call_result;
- HWND parent, thiswindow;
+ HWND thiswindow;
if (window == NULL || GDK_SURFACE_HWND (window) == NULL)
return FALSE;
@@ -284,12 +284,6 @@ _gdk_win32_surface_enable_transparency (GdkSurface *window)
thiswindow = GDK_SURFACE_HWND (window);
- /* Blurbehind only works on toplevel windows */
- parent = GetAncestor (thiswindow, GA_PARENT);
- if (!(GetWindowLong (thiswindow, GWL_STYLE) & WS_POPUP) &&
- (parent == NULL || parent != GetDesktopWindow ()))
- return FALSE;
-
empty_region = CreateRectRgn (0, 0, -1, -1);
if (empty_region == NULL)
@@ -1127,11 +1121,6 @@ gdk_win32_surface_move (GdkSurface *window,
if (window->state & GDK_SURFACE_STATE_FULLSCREEN)
return;
- if (GetAncestor (GDK_SURFACE_HWND (window), GA_PARENT) != GetDesktopWindow ())
- {
- _gdk_surface_move_resize_child (window, x, y, window->width, window->height);
- }
- else
{
RECT outer_rect;
GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
@@ -1175,11 +1164,6 @@ gdk_win32_surface_resize (GdkSurface *window,
if (window->state & GDK_SURFACE_STATE_FULLSCREEN)
return;
- if (GetAncestor (GDK_SURFACE_HWND (window), GA_PARENT) != GetDesktopWindow ())
- {
- _gdk_surface_move_resize_child (window, window->x, window->y, width, height);
- }
- else
{
RECT outer_rect;
@@ -1225,11 +1209,6 @@ gdk_win32_surface_move_resize_internal (GdkSurface *window,
GDK_SURFACE_HWND (window),
width, height, x, y));
- if (GetAncestor (GDK_SURFACE_HWND (window), GA_PARENT) != GetDesktopWindow ())
- {
- _gdk_surface_move_resize_child (window, x, y, width, height);
- }
- else
{
RECT outer_rect;
GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h
index cbe0472fb5..1d6c4b3626 100644
--- a/gdk/win32/gdksurface-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -261,7 +261,6 @@ struct _GdkWin32Surface
* We don't actually set margins to 0, we just set this bit.
*/
guint zero_margins : 1;
- guint no_bg : 1;
guint inhibit_configure : 1;
/* Set to TRUE if window is using true layered mode adjustments
@@ -349,14 +348,6 @@ struct _GdkWin32SurfaceClass
GType _gdk_win32_surface_get_type (void);
-void _gdk_win32_surface_tmp_unset_bg (GdkSurface *window,
- gboolean recurse);
-void _gdk_win32_surface_tmp_reset_bg (GdkSurface *window,
- gboolean recurse);
-
-void _gdk_win32_surface_tmp_unset_parent_bg (GdkSurface *window);
-void _gdk_win32_surface_tmp_reset_parent_bg (GdkSurface *window);
-
void _gdk_win32_surface_update_style_bits (GdkSurface *window);
gint _gdk_win32_surface_get_scale_factor (GdkSurface *window);
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 11f8da78b2..9567c96609 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -12,7 +12,6 @@ gdk_win32_sources = files([
'gdkdrag-win32.c',
'gdkdrop-win32.c',
'gdkevents-win32.c',
- 'gdkgeometry-win32.c',
'gdkglcontext-win32.c',
'gdkglobals-win32.c',
'gdkhdataoutputstream-win32.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]