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 /win | |
| 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 'win')
| -rw-r--r-- | win/tkWinEmbed.c | 3 | ||||
| -rw-r--r-- | win/tkWinWm.c | 9 |
2 files changed, 7 insertions, 5 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; } diff --git a/win/tkWinWm.c b/win/tkWinWm.c index f10010b..de4056a 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.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: tkWinWm.c,v 1.54.2.24 2006/04/05 19:47:49 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.25 2006/04/11 20:23:45 hobbs Exp $ */ #include "tkWinInt.h" @@ -5582,10 +5582,13 @@ UpdateGeometryInfo(clientData) */ if (winPtr->flags & TK_BOTH_HALVES) { + TkWindow *childPtr = TkpGetOtherWindow(winPtr); + wmPtr->x = wmPtr->y = 0; wmPtr->flags &= ~(WM_NEGATIVE_X|WM_NEGATIVE_Y); - Tk_GeometryRequest((Tk_Window) TkpGetOtherWindow(winPtr), - width, height); + if (childPtr != NULL) { + Tk_GeometryRequest((Tk_Window) childPtr, width, height); + } return; } |