diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-29 08:22:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-29 08:22:32 (GMT) |
| commit | 83dd76da7170a8bb9c59b60508c5df606204709c (patch) | |
| tree | 80e0b58dcbf82e4938b45f818c125a17099d7fc2 /win | |
| parent | 6543fa41fa55392ee287df3d24888f2662bb7b8d (diff) | |
| parent | 64ac9dba8558f572db2bd2d6f908134796bf92c3 (diff) | |
| download | tk-83dd76da7170a8bb9c59b60508c5df606204709c.zip tk-83dd76da7170a8bb9c59b60508c5df606204709c.tar.gz tk-83dd76da7170a8bb9c59b60508c5df606204709c.tar.bz2 | |
merge trunk
Diffstat (limited to 'win')
| -rw-r--r-- | win/rules.vc | 11 | ||||
| -rw-r--r-- | win/tkWinWm.c | 18 |
2 files changed, 11 insertions, 18 deletions
diff --git a/win/rules.vc b/win/rules.vc index 01e44e0..f2ee135 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -473,18 +473,21 @@ OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD OPTDEFINES = $(OPTDEFINES) -DTCL_NO_DEPRECATED !endif -!if $(DEBUG) -OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DEBUG -!elseif $(OPTIMIZING) +!if !$(DEBUG) +OPTDEFINES = $(OPTDEFINES) -DNDEBUG +!if $(OPTIMIZING) OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_OPTIMIZED !endif +!endif !if $(PROFILE) OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_PROFILED !endif !if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64" OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DO64BIT !endif - +!if $(VCVERSION) < 1300 +OPTDEFINES = $(OPTDEFINES) -DNO_STRTOI64 +!endif #---------------------------------------------------------- # Locate the Tcl headers to build against diff --git a/win/tkWinWm.c b/win/tkWinWm.c index e4c9c34..2aa251c 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -6401,20 +6401,10 @@ Tk_GetVRootGeometry( int *widthPtr, int *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); } /* |