diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 55034b623..f9f8baa96 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -499,7 +499,6 @@ typedef struct _winPrivScreenRec { winCreateScreenResourcesProc pwinCreateScreenResources; /* Window Procedures for Rootless mode */ - UnrealizeWindowProcPtr UnrealizeWindow; ValidateTreeProcPtr ValidateTree; PostValidateTreeProcPtr PostValidateTree; ClearToBackgroundProcPtr ClearToBackground; diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 9ac923308..da9b69fb7 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -285,19 +285,13 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask) Bool winUnmapWindowMultiWindow(WindowPtr pWin) { - Bool fResult = TRUE; - ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); - winScreenPriv(pScreen); #if ENABLE_DEBUG ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin); #endif - WIN_UNWRAP(UnrealizeWindow); - fResult = (*pScreen->UnrealizeWindow) (pWin); - WIN_WRAP(UnrealizeWindow, winUnmapWindowMultiWindow); + Bool fResult = fbUnrealizeWindow(pWin); /* Flag that the window has been killed */ pWinPriv->fXKilled = TRUE; diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index bfa981d07..ec38dd596 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -377,9 +377,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) pScreenPriv->a = NULL; \ } - /* Save a pointer to each lower-level window procedure */ - WRAP(UnrealizeWindow); - /* Assign rootless window procedures to be top level procedures */ pScreen->CreateWindow = winCreateWindowRootless; pScreen->DestroyWindow = winDestroyWindowRootless; @@ -405,7 +402,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) } /* Save a pointer to each lower-level window procedure */ - WRAP(UnrealizeWindow); WRAP(ReparentWindow); WRAP(RestackWindow); WRAP(ResizeWindow); diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index 7509611a4..5f3448a94 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -137,19 +137,13 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask) Bool winUnmapWindowRootless(WindowPtr pWin) { - Bool fResult = FALSE; - ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); - winScreenPriv(pScreen); #if ENABLE_DEBUG winTrace("winUnmapWindowRootless (%p)\n", pWin); #endif - WIN_UNWRAP(UnrealizeWindow); - fResult = (*pScreen->UnrealizeWindow) (pWin); - WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless); + Bool fResult = fbUnrealizeWindow(pWin); if (pWinPriv->hRgn != NULL) { DeleteObject(pWinPriv->hRgn);