summaryrefslogtreecommitdiffstats
path: root/win/tkWinEmbed.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-04-11 20:23:44 (GMT)
committerhobbs <hobbs>2006-04-11 20:23:44 (GMT)
commita180cfc3bc374faaa81bd36bc1f51c175b085e17 (patch)
treea0e8b9c2dee308ca79631372ca6f3a2fbdf3954f /win/tkWinEmbed.c
parentdf63e91e7faef3ea0413bc478fc71e2b0f205f73 (diff)
downloadtk-a180cfc3bc374faaa81bd36bc1f51c175b085e17.zip
tk-a180cfc3bc374faaa81bd36bc1f51c175b085e17.tar.gz
tk-a180cfc3bc374faaa81bd36bc1f51c175b085e17.tar.bz2
* win/tkWinEmbed.c (TkpGetOtherWindow): do not panic if no window
* win/tkWinWm.c (UpdateGeometryInfo): is found - handle it in * unix/tkUnixEmbed.c (TkpGetOtherWindow): the caller. [Bug 1212056] * unix/tkUnixWm.c (Tk_CoordsToWindow, UpdateGeometryInfo):
Diffstat (limited to 'win/tkWinEmbed.c')
-rw-r--r--win/tkWinEmbed.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c
index a916050..977d52c 100644
--- a/win/tkWinEmbed.c
+++ b/win/tkWinEmbed.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: tkWinEmbed.c,v 1.7.2.1 2004/10/27 00:37:38 davygrvy Exp $
+ * RCS: @(#) $Id: tkWinEmbed.c,v 1.7.2.2 2006/04/11 20:23:45 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -542,7 +542,6 @@ TkpGetOtherWindow(winPtr)
return containerPtr->embeddedPtr;
}
}
- panic("TkpGetOtherWindow couldn't find window");
return NULL;
}