diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 1ea6f3173..55034b623 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 */ - RealizeWindowProcPtr RealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow; ValidateTreeProcPtr ValidateTree; PostValidateTreeProcPtr PostValidateTree; diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index f75fe64ce..078d020b8 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -345,9 +345,7 @@ winMapWindowMultiWindow(WindowPtr pWin) ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin); #endif - WIN_UNWRAP(RealizeWindow); - fResult = (*pScreen->RealizeWindow) (pWin); - WIN_WRAP(RealizeWindow, winMapWindowMultiWindow); + fbRealizeWindow(pWin); /* Flag that this window has not been destroyed */ pWinPriv->fXKilled = FALSE; diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index ccc06560a..bfa981d07 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -378,7 +378,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) } /* Save a pointer to each lower-level window procedure */ - WRAP(RealizeWindow); WRAP(UnrealizeWindow); /* Assign rootless window procedures to be top level procedures */ @@ -406,7 +405,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) } /* Save a pointer to each lower-level window procedure */ - WRAP(RealizeWindow); WRAP(UnrealizeWindow); WRAP(ReparentWindow); WRAP(RestackWindow); diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index 2aec4d833..c9d63a2ee 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -194,9 +194,7 @@ winMapWindowRootless(WindowPtr pWin) winTrace("winMapWindowRootless (%p)\n", pWin); #endif - WIN_UNWRAP(RealizeWindow); - fResult = (*pScreen->RealizeWindow) (pWin); - WIN_WRAP(RealizeWindow, winMapWindowRootless); + fbRealizeWindow(pWin); winReshapeRootless(pWin);