From 9ed83a694b6492c9db226b115ed282cb127e798e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 18 Sep 2014 15:36:57 -0400 Subject: mi: miSlideAndSizeWindow -> miResizeWindow Make the function name match the screen slot name. Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- mi/mi.h | 12 ++++++------ mi/miscrinit.c | 2 +- mi/miwindow.c | 5 ++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mi/mi.h b/mi/mi.h index 8cb3ce7a5..5a455c910 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -470,12 +470,12 @@ extern _X_EXPORT void miMoveWindow(WindowPtr /*pWin */ , VTKind /*kind */ ); -extern _X_EXPORT void miSlideAndSizeWindow(WindowPtr /*pWin */ , - int /*x */ , - int /*y */ , - unsigned int /*w */ , - unsigned int /*h */ , - WindowPtr /*pSib */ +extern _X_EXPORT void miResizeWindow(WindowPtr /*pWin */ , + int /*x */ , + int /*y */ , + unsigned int /*w */ , + unsigned int /*h */ , + WindowPtr /*pSib */ ); extern _X_EXPORT WindowPtr miGetLayerWindow(WindowPtr /*pWin */ diff --git a/mi/miscrinit.c b/mi/miscrinit.c index ec4d10819..327bd1540 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -264,7 +264,7 @@ miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */ pScreen->MarkWindow = miMarkWindow; pScreen->MarkOverlappedWindows = miMarkOverlappedWindows; pScreen->MoveWindow = miMoveWindow; - pScreen->ResizeWindow = miSlideAndSizeWindow; + pScreen->ResizeWindow = miResizeWindow; pScreen->GetLayerWindow = miGetLayerWindow; pScreen->HandleExposures = miHandleValidateExposures; pScreen->ReparentWindow = (ReparentWindowProcPtr) 0; diff --git a/mi/miwindow.c b/mi/miwindow.c index ba4c9ed5c..cfe085a4c 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -337,9 +337,8 @@ miRecomputeExposures(WindowPtr pWin, void *value) } void -miSlideAndSizeWindow(WindowPtr pWin, - int x, int y, - unsigned int w, unsigned int h, WindowPtr pSib) +miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w, unsigned int h, + WindowPtr pSib) { WindowPtr pParent; Bool WasViewable = (Bool) (pWin->viewable); -- cgit v1.2.3