summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogelnew1@free.fr <fvogel>2016-04-21 16:33:03 (GMT)
committerfvogelnew1@free.fr <fvogel>2016-04-21 16:33:03 (GMT)
commit209c06ac40dd5a2edea3cfc2481e0408614f29ae (patch)
tree03919778bfee3f9ea146c905f6add344c234b949 /generic
parent085a25a12e666f951889000a333e5a958dce3e9c (diff)
downloadtk-bug_c95d4691ff.zip
tk-bug_c95d4691ff.tar.gz
tk-bug_c95d4691ff.tar.bz2
Fixed [c95d4691ff] - winfo screenheight w/dual monitors returns the screen height of the primary displaybug_c95d4691ff
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCmds.c8
-rw-r--r--generic/tkInt.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 6196b17..1b871eb 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1477,12 +1477,12 @@ Tk_WinfoObjCmd(
Tcl_NewIntObj(DefaultDepthOfScreen(Tk_Screen(tkwin))));
break;
case WIN_SCREENHEIGHT:
- Tcl_SetObjResult(interp,
- Tcl_NewIntObj(HeightOfScreen(Tk_Screen(tkwin))));
+ Tcl_SetObjResult(interp,
+ Tcl_NewIntObj(TkpHeightOfScreen(tkwin)));
break;
case WIN_SCREENWIDTH:
- Tcl_SetObjResult(interp,
- Tcl_NewIntObj(WidthOfScreen(Tk_Screen(tkwin))));
+ Tcl_SetObjResult(interp,
+ Tcl_NewIntObj(TkpWidthOfScreen(tkwin)));
break;
case WIN_SCREENMMHEIGHT:
Tcl_SetObjResult(interp,
diff --git a/generic/tkInt.h b/generic/tkInt.h
index b644c5b..b330601 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1217,6 +1217,8 @@ MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp,
MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp,
ClientData clientData);
MODULE_SCOPE void TkpWarpPointer(TkDisplay *dispPtr);
+MODULE_SCOPE int TkpHeightOfScreen(Tk_Window tkwin);
+MODULE_SCOPE int TkpWidthOfScreen(Tk_Window tkwin);
#ifdef _WIN32
#define TkParseColor XParseColor