diff options
| author | hobbs <hobbs> | 2006-04-11 20:23:44 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-04-11 20:23:44 (GMT) |
| commit | d0a666e9c9e337b597f57095c22c8fb39b918425 (patch) | |
| tree | a0e8b9c2dee308ca79631372ca6f3a2fbdf3954f /unix | |
| parent | 39394c1167057439fa67fd1e23f5ffcc569d84a9 (diff) | |
| download | tk-d0a666e9c9e337b597f57095c22c8fb39b918425.zip tk-d0a666e9c9e337b597f57095c22c8fb39b918425.tar.gz tk-d0a666e9c9e337b597f57095c22c8fb39b918425.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 'unix')
| -rw-r--r-- | unix/tkUnixEmbed.c | 3 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c index 6cf9159..04eb4ba 100644 --- a/unix/tkUnixEmbed.c +++ b/unix/tkUnixEmbed.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: tkUnixEmbed.c,v 1.6 2002/08/05 04:30:41 dgp Exp $ + * RCS: @(#) $Id: tkUnixEmbed.c,v 1.6.2.1 2006/04/11 20:23:44 hobbs Exp $ */ #include "tkInt.h" @@ -729,7 +729,6 @@ TkpGetOtherWindow(winPtr) return containerPtr->embeddedPtr; } } - panic("TkpGetOtherWindow couldn't find window"); return NULL; } diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index ab4c664..3c92139 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.36.2.6 2005/06/01 00:07:29 mdejong Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.36.2.7 2006/04/11 20:23:45 hobbs Exp $ */ #include "tkPort.h" @@ -4254,6 +4254,7 @@ UpdateGeometryInfo(clientData) if ((winPtr->flags & (TK_EMBEDDED|TK_BOTH_HALVES)) == (TK_EMBEDDED|TK_BOTH_HALVES)) { + TkWindow *childPtr = TkpGetOtherWindow(winPtr); /* * This window is embedded and the container is also in this * process, so we don't need to do anything special about the @@ -4264,11 +4265,13 @@ UpdateGeometryInfo(clientData) wmPtr->x = wmPtr->y = 0; wmPtr->flags &= ~(WM_NEGATIVE_X|WM_NEGATIVE_Y); - height += wmPtr->menuHeight; - Tk_GeometryRequest((Tk_Window) TkpGetOtherWindow(winPtr), - width, height); + if (childPtr != NULL) { + height += wmPtr->menuHeight; + Tk_GeometryRequest((Tk_Window) childPtr, width, height); + } return; } + serial = NextRequest(winPtr->display); height += wmPtr->menuHeight; if (wmPtr->flags & WM_MOVE_PENDING) { @@ -5261,6 +5264,9 @@ Tk_CoordsToWindow(rootX, rootY, tkwin) */ winPtr = TkpGetOtherWindow(winPtr); + if (winPtr == NULL) { + return NULL; + } wmPtr = winPtr->wmInfoPtr; childX = x; childY = y; |