summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@noemail.net>2012-09-16 22:36:20 (GMT)
committerdgp <dgp@noemail.net>2012-09-16 22:36:20 (GMT)
commit2298ab73ce183b90fef1101cfb2ec8dad2964a56 (patch)
tree8aaf9e7a4fda4ee1c540fcfbe10e3db2a819a7a9
parentdef34e7cc953924b2e5a9da9e47ffdb574e855c8 (diff)
downloadtk-2298ab73ce183b90fef1101cfb2ec8dad2964a56.zip
tk-2298ab73ce183b90fef1101cfb2ec8dad2964a56.tar.gz
tk-2298ab73ce183b90fef1101cfb2ec8dad2964a56.tar.bz2
Updated branch now stops all segfaults and panics in the test suite.
Not a lot of confidence that other problems haven't been created, including memleaks and broken functionality in areas. A review would be a good idea. So would a trunk that doesn't segfault the test suite. FossilOrigin-Name: 0f45936168a2885d1541a2e313bb0afa60619465
-rw-r--r--macosx/tkMacOSXWm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index f5aefef..3a1da10 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1649,7 +1649,12 @@ WmForgetCmd(
register Tk_Window frameWin = (Tk_Window) winPtr;
if (Tk_IsTopLevel(frameWin)) {
- MacDrawable *macWin = (MacDrawable *) winPtr->window;
+ MacDrawable *macWin;
+
+ Tk_MakeWindowExist(winPtr);
+ Tk_MakeWindowExist(winPtr->parentPtr);
+
+ macWin = (MacDrawable *) winPtr->window;
TkFocusJoin(winPtr);
Tk_UnmapWindow(frameWin);