diff --git a/hw/xwin/win.h b/hw/xwin/win.h index f9f8baa96..0b5cf120a 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -504,7 +504,6 @@ typedef struct _winPrivScreenRec { ClearToBackgroundProcPtr ClearToBackground; ClipNotifyProcPtr ClipNotify; RestackWindowProcPtr RestackWindow; - ReparentWindowProcPtr ReparentWindow; ResizeWindowProcPtr ResizeWindow; MoveWindowProcPtr MoveWindow; ModifyPixmapHeaderProcPtr ModifyPixmapHeader; diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index da9b69fb7..68ead001f 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -338,21 +338,12 @@ winMapWindowMultiWindow(WindowPtr pWin) void winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent) { - ScreenPtr pScreen = pWin->drawable.pScreen; - - winScreenPriv(pScreen); - winDebug ("winReparentMultiWindow - pWin:%p XID:0x%x, reparent from pWin:%p XID:0x%x to pWin:%p XID:0x%x\n", pWin, (unsigned int)pWin->drawable.id, pPriorParent, (unsigned int)pPriorParent->drawable.id, pWin->parent, (unsigned int)pWin->parent->drawable.id); - WIN_UNWRAP(ReparentWindow); - if (pScreen->ReparentWindow) - (*pScreen->ReparentWindow) (pWin, pPriorParent); - WIN_WRAP(ReparentWindow, winReparentWindowMultiWindow); - /* Update the Windows window associated with this X window */ winUpdateWindowsWindow(pWin); } diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index ec38dd596..bfca9a8c4 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -402,7 +402,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) } /* Save a pointer to each lower-level window procedure */ - WRAP(ReparentWindow); WRAP(RestackWindow); WRAP(ResizeWindow); WRAP(MoveWindow);