summaryrefslogtreecommitdiffstats
path: root/generic/tkUtil.c
diff options
context:
space:
mode:
authorericm <ericm>2000-04-18 02:18:32 (GMT)
committerericm <ericm>2000-04-18 02:18:32 (GMT)
commit3b8d97bbddc028359dd7f579f7f4e2fdaf887752 (patch)
tree1a5b1bcdfcedcc57a982da47be2f49a3aba66103 /generic/tkUtil.c
parent642a893448534c32d814fa625c78d6ab695cad1b (diff)
downloadtk-3b8d97bbddc028359dd7f579f7f4e2fdaf887752.zip
tk-3b8d97bbddc028359dd7f579f7f4e2fdaf887752.tar.gz
tk-3b8d97bbddc028359dd7f579f7f4e2fdaf887752.tar.bz2
* win/tkWinDialog.c: Added checks for visibility of parent window
before creating MessageBox and ChooseColor dialogs; this prevents the application from locking when the parent is withdrawn and the message box is created. In these cases, the window will be created without a parent. * unix/mkLinks: Added WinViewable.3. * tests/msgbox.test: Added tests for patch from [Bug: 4997]. * library/msgbox.tcl: * library/dialog.tcl: Applied patch from [Bug: 4997]; detaches dialog window from parent if parent is not viewable. * library/bgerror.tcl: Removed workaround from [Bug: 4370]; this is superceeded by patches to dialog.tcl. * generic/tkCmds.c: Changed WinfoObjCmd to use Tk_IsViewable function to determine visibility of windows instead of inlining the code. * generic/tkStubInit.c: * generic/tkDecls.h: * generic/tk.decls: Added Tk_IsViewable declaration.
Diffstat (limited to 'generic/tkUtil.c')
-rw-r--r--generic/tkUtil.c36
1 files changed, 35 insertions, 1 deletions
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 0ba1f96..b677e03 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUtil.c,v 1.7 1999/12/14 06:52:34 hobbs Exp $
+ * RCS: @(#) $Id: tkUtil.c,v 1.8 2000/04/18 02:18:33 ericm Exp $
*/
#include "tkInt.h"
@@ -951,3 +951,37 @@ TkFindStateNumObj(interp, optionPtr, mapPtr, keyPtr)
}
return mPtr->numKey;
}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tk_IsViewable --
+ *
+ * Given a Tk_Window pointer, determine if that window is viewable.
+ *
+ * Results:
+ * 1 if the window is viewable, 0 otherwise.
+ *
+ * Side effects:
+ * None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tk_IsViewable(tkwin)
+ Tk_Window tkwin; /* Pointer to the window to examine */
+{
+ TkWindow *winPtr = (TkWindow *)tkwin;
+ int viewable = 0;
+ for ( ; ; winPtr = winPtr->parentPtr) {
+ if ((winPtr == NULL) || !(winPtr->flags & TK_MAPPED)) {
+ break;
+ }
+ if (winPtr->flags & TK_TOP_LEVEL) {
+ viewable = 1;
+ break;
+ }
+ }
+ return viewable;
+}