aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/dmxwindow.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-21 19:07:36 +0000
committermarha <marha@users.sourceforge.net>2009-10-21 19:07:36 +0000
commit1f876171067c04fc21fccd5a3051f982fd85c0f0 (patch)
tree1f7883e3e5f5ef5cd401ee7c70dd5e679efd0615 /xorg-server/hw/dmx/dmxwindow.c
parent7687adcc34c9fc43d526f30b1cf2039b0af48841 (diff)
downloadvcxsrv-1f876171067c04fc21fccd5a3051f982fd85c0f0.tar.gz
vcxsrv-1f876171067c04fc21fccd5a3051f982fd85c0f0.tar.bz2
vcxsrv-1f876171067c04fc21fccd5a3051f982fd85c0f0.zip
Updated to xorg-server-1.7.99.1
Diffstat (limited to 'xorg-server/hw/dmx/dmxwindow.c')
-rw-r--r--xorg-server/hw/dmx/dmxwindow.c7
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;