summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXWm.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-02-12 15:46:44 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-02-12 15:46:44 (GMT)
commit0f8433166f0f08199aa9feef883201a625281606 (patch)
tree8671bd654853fe5c51513ef5fac9b4662e9fafea /macosx/tkMacOSXWm.c
parent034bcb96462692043eaeffb14ad48d2d9d21ca41 (diff)
parentf0588ea6f1632841dfe7ed350ea5c0e78331882d (diff)
downloadtk-0f8433166f0f08199aa9feef883201a625281606.zip
tk-0f8433166f0f08199aa9feef883201a625281606.tar.gz
tk-0f8433166f0f08199aa9feef883201a625281606.tar.bz2
merge 8.5
Diffstat (limited to 'macosx/tkMacOSXWm.c')
-rw-r--r--macosx/tkMacOSXWm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index b834766..210fd6f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1652,8 +1652,8 @@ WmForgetCmd(
MacDrawable *macWin;
- Tk_MakeWindowExist(winPtr);
- Tk_MakeWindowExist(winPtr->parentPtr);
+ Tk_MakeWindowExist(frameWin);
+ Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr);
macWin = (MacDrawable *) winPtr->window;
@@ -2403,7 +2403,6 @@ WmManageCmd(
register Tk_Window frameWin = (Tk_Window)winPtr;
register WmInfo *wmPtr = winPtr->wmInfoPtr;
- char *oldClass = (char*)Tk_Class(frameWin);
if (!Tk_IsTopLevel(frameWin)) {
MacDrawable *macWin = (MacDrawable *) winPtr->window;