regression: listbox stays disabled in created dialog-window
Alexandre Julliard
julliard at winehq.org
Tue Aug 31 20:10:22 CDT 2004
Rein Klazes <rklazes at xs4all.nl> writes:
> Well, Pegasus Mail has the same problem with lists. And it is fatal: no
> mail in any mailbox is visible.
>
> The configuration dialog of Agent news reader has yet another problem,
> disappearing buttons:
>
> http://home.wanadoo.nl/wijn/tmp/shot1.png before
> http://home.wanadoo.nl/wijn/tmp/shot2.png after
Does this help?
Index: dlls/x11drv/winpos.c
===================================================================
RCS file: /opt/cvs-commit/wine/dlls/x11drv/winpos.c,v
retrieving revision 1.98
diff -u -p -r1.98 winpos.c
--- dlls/x11drv/winpos.c 24 Aug 2004 18:49:34 -0000 1.98
+++ dlls/x11drv/winpos.c 1 Sep 2004 01:03:45 -0000
@@ -416,21 +416,33 @@ BOOL X11DRV_GetDC( HWND hwnd, HDC hdc, H
if (top != hwnd)
{
+ /* find the top most parent that doesn't clip siblings */
+ HWND clipping_parent = 0;
+ HWND *list = WIN_ListParents( hwnd );
+ if (list)
+ {
+ int i;
+ for (i = 0; list[i] != top; i++)
+ {
+ LONG style = GetWindowLongW( list[i], GWL_STYLE );
+ if (!(style & WS_CLIPSIBLINGS)) clipping_parent = list[i];
+ }
+ HeapFree( GetProcessHeap(), 0, list );
+ }
+ if (clipping_parent) clipping_parent = GetAncestor( clipping_parent, GA_PARENT );
+ else if (!(flags & DCX_CLIPSIBLINGS)) clipping_parent = GetAncestor( hwnd, GA_PARENT );
+ else clipping_parent = hwnd;
+
+ escape.org.x = escape.org.y = 0;
escape.drawable_org.x = escape.drawable_org.y = 0;
- if (flags & (DCX_WINDOW|DCX_PARENTCLIP))
+ if (flags & DCX_WINDOW)
{
escape.org.x = win->rectWindow.left - win->rectClient.left;
escape.org.y = win->rectWindow.top - win->rectClient.top;
- MapWindowPoints( hwnd, top, &escape.org, 1 );
- MapWindowPoints( top, 0, &escape.drawable_org, 1 );
- escape.drawable = X11DRV_get_client_window( top );
- }
- else
- {
- escape.org.x = escape.org.y = 0;
- MapWindowPoints( hwnd, 0, &escape.drawable_org, 1 );
- escape.drawable = X11DRV_get_client_window( hwnd );
}
+ MapWindowPoints( hwnd, clipping_parent, &escape.org, 1 );
+ MapWindowPoints( clipping_parent, 0, &escape.drawable_org, 1 );
+ escape.drawable = X11DRV_get_client_window( clipping_parent );
}
else
{
--
Alexandre Julliard
julliard at winehq.org
More information about the wine-devel
mailing list