diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 6c9ce13694b..31a49eecc6e 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -117,7 +117,6 @@ static BOOL load_driver(void) GET_USER_FUNC(CreateWindow); GET_USER_FUNC(DestroyWindow); GET_USER_FUNC(GetDC); - GET_USER_FUNC(ForceWindowRaise); GET_USER_FUNC(MsgWaitForMultipleObjectsEx); GET_USER_FUNC(ReleaseDC); GET_USER_FUNC(ScrollDC); diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h index ae504426f48..0e6435d2580 100644 --- a/dlls/user/user_private.h +++ b/dlls/user/user_private.h @@ -99,7 +99,6 @@ typedef struct tagUSER_DRIVER { BOOL (*pCreateWindow)(HWND,CREATESTRUCTA*,BOOL); BOOL (*pDestroyWindow)(HWND); BOOL (*pGetDC)(HWND,HDC,HRGN,DWORD); - void (*pForceWindowRaise)(HWND); DWORD (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); void (*pReleaseDC)(HWND,HDC); BOOL (*pScrollDC)(HDC, INT, INT, const RECT *, const RECT *, HRGN, LPRECT); diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index 7810a6cf884..cd34d186f9e 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -2044,57 +2044,3 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else WINPOS_ShowIconTitle( hwnd, TRUE ); } } - - -/*********************************************************************** - * ForceWindowRaise (X11DRV.@) - * - * Raise a window on top of the X stacking order, while preserving - * the correct Windows Z order. - * - * FIXME: this should go away. - */ -void X11DRV_ForceWindowRaise( HWND hwnd ) -{ - int i = 0; - HWND *list; - XWindowChanges winChanges; - Display *display = thread_display(); - WND *wndPtr = WIN_FindWndPtr( hwnd ); - - if (!wndPtr) return; - - if ((wndPtr->dwExStyle & WS_EX_MANAGED) || - wndPtr->parent != GetDesktopWindow() || - IsRectEmpty( &wndPtr->rectWindow ) || - !get_whole_window(wndPtr)) - { - WIN_ReleaseWndPtr( wndPtr ); - return; - } - WIN_ReleaseWndPtr( wndPtr ); - - /* Raise all windows up to wndPtr according to their Z order. - * (it would be easier with sibling-related Below but it doesn't - * work very well with SGI mwm for instance) - */ - winChanges.stack_mode = Above; - if (!(list = WIN_ListChildren( GetDesktopWindow() ))) return; - while (list[i] && list[i] != hwnd) i++; - if (list[i]) - { - for ( ; i >= 0; i--) - { - WND *ptr = WIN_FindWndPtr( list[i] ); - if (!ptr) continue; - if (!IsRectEmpty( &ptr->rectWindow ) && get_whole_window(ptr)) - { - wine_tsx11_lock(); - XReconfigureWMWindow( display, get_whole_window(ptr), 0, CWStackMode, &winChanges ); - wine_tsx11_unlock(); - } - WIN_ReleaseWndPtr( ptr ); - } - } - HeapFree( GetProcessHeap(), 0, list ); -} diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec index 97d2d0d2ff1..f97ec9436fb 100644 --- a/dlls/x11drv/x11drv.spec +++ b/dlls/x11drv/x11drv.spec @@ -90,7 +90,6 @@ @ cdecl EmptyClipboard(long) X11DRV_EmptyClipboard @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats -@ cdecl ForceWindowRaise(long) X11DRV_ForceWindowRaise @ cdecl GetClipboardData(long ptr ptr) X11DRV_GetClipboardData @ cdecl GetClipboardFormatName(long str long) X11DRV_GetClipboardFormatName @ cdecl GetDC(long long long long) X11DRV_GetDC