diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
| commit | e141b55eccf3c69d8ced513992e21463d37dbb03 (patch) | |
| tree | eaeeeda04d5b6ce82d43d04466164b44a74d0951 /xorg-server/hw/dmx/dmxwindow.c | |
| parent | d0fe50e45b3a640afa51eb8f45cf7c3a0df0740b (diff) | |
| parent | 1f876171067c04fc21fccd5a3051f982fd85c0f0 (diff) | |
| download | vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.gz vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.bz2 vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/dmx/dmxwindow.c')
| -rw-r--r-- | xorg-server/hw/dmx/dmxwindow.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c index 24acc08e3..f9e46db1e 100644 --- a/xorg-server/hw/dmx/dmxwindow.c +++ b/xorg-server/hw/dmx/dmxwindow.c @@ -116,7 +116,7 @@ Window dmxCreateRootWindow(WindowPtr pWindow) } /** Change the location and size of the "screen" window. Called from - * #dmxReconfigureScreenWindow(). */ + * #dmxConfigureScreenWindow(). */ void dmxResizeScreenWindow(ScreenPtr pScreen, int x, int y, int w, int h) { @@ -139,7 +139,7 @@ void dmxResizeScreenWindow(ScreenPtr pScreen, } /** Change the location and size of the "root" window. Called from - * #dmxReconfigureRootWindow(). */ + * #dmxConfigureRootWindow. */ void dmxResizeRootWindow(WindowPtr pRoot, int x, int y, int w, int h) { @@ -419,10 +419,9 @@ Bool dmxDestroyWindow(WindowPtr pWindow) pWinPriv->windowDestroyed(pWindow); #endif -#if 0 if (pScreen->DestroyWindow) ret = pScreen->DestroyWindow(pWindow); -#endif + DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen); return ret; |