xwin: drop winResizeWindowMultiWindow()
This wrapping function for Screen->ResizeWindow() is does nothing more than just call the original functions. So no need to keep wrapping it at all. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									6ab0e0ae02
								
							
						
					
					
						commit
						36ec20c4bd
					
				| 
						 | 
					@ -503,7 +503,6 @@ typedef struct _winPrivScreenRec {
 | 
				
			||||||
    PostValidateTreeProcPtr PostValidateTree;
 | 
					    PostValidateTreeProcPtr PostValidateTree;
 | 
				
			||||||
    ClearToBackgroundProcPtr ClearToBackground;
 | 
					    ClearToBackgroundProcPtr ClearToBackground;
 | 
				
			||||||
    ClipNotifyProcPtr ClipNotify;
 | 
					    ClipNotifyProcPtr ClipNotify;
 | 
				
			||||||
    ResizeWindowProcPtr ResizeWindow;
 | 
					 | 
				
			||||||
    ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 | 
					    ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    winCursorRec cursor;
 | 
					    winCursorRec cursor;
 | 
				
			||||||
| 
						 | 
					@ -910,11 +909,6 @@ void
 | 
				
			||||||
 winReorderWindowsMultiWindow(void);
 | 
					 winReorderWindowsMultiWindow(void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
 | 
					 | 
				
			||||||
winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
 | 
					 | 
				
			||||||
                           unsigned int h, WindowPtr pSib);
 | 
					 | 
				
			||||||
void
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
 | 
					winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
 | 
				
			||||||
                         WindowPtr pSib, VTKind kind);
 | 
					                         WindowPtr pSib, VTKind kind);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -762,25 +762,6 @@ winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
 | 
				
			||||||
    miMoveWindow(pWin, x, y, pSib, kind);
 | 
					    miMoveWindow(pWin, x, y, pSib, kind);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
 * ResizeWindow - See Porting Layer Definition - p. 42
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
void
 | 
					 | 
				
			||||||
winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
 | 
					 | 
				
			||||||
                           unsigned int h, WindowPtr pSib)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    ScreenPtr pScreen = pWin->drawable.pScreen;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    winScreenPriv(pScreen);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if ENABLE_DEBUG
 | 
					 | 
				
			||||||
    ErrorF("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
    WIN_UNWRAP(ResizeWindow);
 | 
					 | 
				
			||||||
    (*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib);
 | 
					 | 
				
			||||||
    WIN_WRAP(ResizeWindow, winResizeWindowMultiWindow);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * winAdjustXWindow
 | 
					 * winAdjustXWindow
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -402,7 +402,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* Save a pointer to each lower-level window procedure */
 | 
					        /* Save a pointer to each lower-level window procedure */
 | 
				
			||||||
        WRAP(ResizeWindow);
 | 
					 | 
				
			||||||
        WRAP(ModifyPixmapHeader);
 | 
					        WRAP(ModifyPixmapHeader);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* Assign multi-window window procedures to be top level procedures */
 | 
					        /* Assign multi-window window procedures to be top level procedures */
 | 
				
			||||||
| 
						 | 
					@ -414,7 +413,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 | 
				
			||||||
        pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
 | 
					        pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
 | 
				
			||||||
        pScreen->ReparentWindow = winReparentWindowMultiWindow;
 | 
					        pScreen->ReparentWindow = winReparentWindowMultiWindow;
 | 
				
			||||||
        pScreen->RestackWindow = winRestackWindowMultiWindow;
 | 
					        pScreen->RestackWindow = winRestackWindowMultiWindow;
 | 
				
			||||||
        pScreen->ResizeWindow = winResizeWindowMultiWindow;
 | 
					 | 
				
			||||||
        pScreen->MoveWindow = winMoveWindowMultiWindow;
 | 
					        pScreen->MoveWindow = winMoveWindowMultiWindow;
 | 
				
			||||||
        pScreen->SetShape = winSetShapeMultiWindow;
 | 
					        pScreen->SetShape = winSetShapeMultiWindow;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue