Remove patch to update gl_drawable for embedded windows (deprecated).

This commit is contained in:
Sebastian Lackner 2014-08-18 00:11:47 +02:00
parent 534422e141
commit 6f776b5d61
4 changed files with 2 additions and 34 deletions

View File

@ -948,18 +948,15 @@ winex11-Window_Groups.ok:
# |
# | Included patches:
# | * Enable/disable windows when they are (un)mapped by foreign applications. [by Sebastian Lackner]
# | * Update gl_drawable for embedded windows. [by Sebastian Lackner]
# |
# | Modified files:
# | * dlls/winex11.drv/event.c, dlls/winex11.drv/window.c
# | * dlls/winex11.drv/event.c
# |
.INTERMEDIATE: winex11-XEMBED.ok
winex11-XEMBED.ok:
$(call APPLY_FILE,winex11-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch)
$(call APPLY_FILE,winex11-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch)
$(call APPLY_FILE,winex11-XEMBED/0001-winex11-Enable-disable-windows-when-they-are-un-mapped.patch)
@( \
echo '+ { "winex11-XEMBED", "Sebastian Lackner", "Enable/disable windows when they are (un)mapped by foreign applications." },'; \
echo '+ { "winex11-XEMBED", "Sebastian Lackner", "Update gl_drawable for embedded windows." },'; \
) > winex11-XEMBED.ok
# Patchset ws2_32-Connect_Time

View File

@ -1,25 +0,0 @@
From f9b183ba340f5dd0f8cf558c91e5a30bf2d09dfd Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 26 Oct 2013 18:40:07 +0200
Subject: winex11: Update gl_drawable for embedded windows
---
dlls/winex11.drv/window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index ebbfd45..6a8d63b 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2286,7 +2286,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags
sync_client_position( data, &old_client_rect, &old_whole_rect );
- if (!data->whole_window)
+ if (data->embedded || !data->whole_window)
{
release_win_data( data );
sync_gl_drawable( hwnd, visible_rect, rectClient );
--
1.7.9.5

View File

@ -2,8 +2,4 @@ Author: Sebastian Lackner
Subject: Enable/disable windows when they are (un)mapped by foreign applications.
Revision: 1
Author: Sebastian Lackner
Subject: Update gl_drawable for embedded windows.
Revision: 1
Fixes: XEMBED support for embedding Wine windows inside Linux applications