summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 11:48:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 11:48:45 (GMT)
commitacfb83993a6266257e059e30e5dffde280882c11 (patch)
treeff59694615ea38e034d8e98a8f4b199b111e243b /win
parentc7759d4c7d331a7db4a2b4d9cf0444cd9bcf1702 (diff)
parentf6ce17f323f35d5c06e37723848cbd7fa8f2f6fa (diff)
downloadtk-acfb83993a6266257e059e30e5dffde280882c11.zip
tk-acfb83993a6266257e059e30e5dffde280882c11.tar.gz
tk-acfb83993a6266257e059e30e5dffde280882c11.tar.bz2
merge core-8-4-branch
Diffstat (limited to 'win')
-rw-r--r--win/tkWinWm.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 2ec1729..6b157cd 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -5995,19 +5995,10 @@ Tk_GetVRootGeometry(tkwin, xPtr, yPtr, widthPtr, heightPtr)
* here. */
int *widthPtr, *heightPtr; /* Store dimensions of virtual root here. */
{
- TkWindow *winPtr = (TkWindow *) tkwin;
-
- /*
- * XXX: This is not correct for multiple monitors. There may be many
- * changes required to get this right, and it may effect existing
- * applications that don't consider possible <0 vroot. See
- * http://msdn.microsoft.com/library/en-us/gdi/monitor_3lrn.asp
- * for more info.
- */
- *xPtr = 0;
- *yPtr = 0;
- *widthPtr = DisplayWidth(winPtr->display, winPtr->screenNum);
- *heightPtr = DisplayHeight(winPtr->display, winPtr->screenNum);
+ *xPtr = GetSystemMetrics(SM_XVIRTUALSCREEN);
+ *yPtr = GetSystemMetrics(SM_YVIRTUALSCREEN);
+ *widthPtr = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+ *heightPtr = GetSystemMetrics(SM_CYVIRTUALSCREEN);
}
/*