diff --git a/hw/xwin/win.h b/hw/xwin/win.h index ec73b72cd..509a4b9d5 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -503,7 +503,6 @@ typedef struct _winPrivScreenRec { UnrealizeWindowProcPtr UnrealizeWindow; ValidateTreeProcPtr ValidateTree; PostValidateTreeProcPtr PostValidateTree; - CopyWindowProcPtr CopyWindow; ClearToBackgroundProcPtr ClearToBackground; ClipNotifyProcPtr ClipNotify; RestackWindowProcPtr RestackWindow; @@ -925,11 +924,6 @@ void winMoveWindowMultiWindow(WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind); -void - -winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt, - RegionPtr oldRegion); - PixmapPtr winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint); diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 87e5e2328..51dbc327e 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -774,24 +774,6 @@ winReorderWindowsMultiWindow(void) fRestacking = FALSE; } -/* - * CopyWindow - See Porting Layer Definition - p. 39 - */ -void -winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt, RegionPtr oldRegion) -{ - ScreenPtr pScreen = pWin->drawable.pScreen; - - winScreenPriv(pScreen); - -#if ENABLE_DEBUG - ErrorF("CopyWindowMultiWindow\n"); -#endif - WIN_UNWRAP(CopyWindow); - (*pScreen->CopyWindow) (pWin, oldpt, oldRegion); - WIN_WRAP(CopyWindow, winCopyWindowMultiWindow); -} - /* * MoveWindow - See Porting Layer Definition - p. 42 */ diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index bf70dd24f..920be7279 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -413,7 +413,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) WRAP(RestackWindow); WRAP(ResizeWindow); WRAP(MoveWindow); - WRAP(CopyWindow); WRAP(SetShape); WRAP(ModifyPixmapHeader); @@ -428,7 +427,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) pScreen->RestackWindow = winRestackWindowMultiWindow; pScreen->ResizeWindow = winResizeWindowMultiWindow; pScreen->MoveWindow = winMoveWindowMultiWindow; - pScreen->CopyWindow = winCopyWindowMultiWindow; pScreen->SetShape = winSetShapeMultiWindow; if (pScreenInfo->fCompositeWM) {