From 83f9d12aa84524eda922d520d77728f5d8b489ca Mon Sep 17 00:00:00 2001
From: cc_benny <cc_benny>
Date: Fri, 26 Sep 2003 16:18:18 +0000
Subject: * macosx/tkMacOSXWm.c (TkWmStackorderToplevelWrapperMap): Add
 GetWindowFromPort() [Bug #812415]; make function static.

---
 ChangeLog           |  5 +++++
 macosx/tkMacOSXWm.c | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41d2d3d..31d86f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-26  Benjamin Riefenstahl  <Benjamin.Riefenstahl@epost.de>
+
+    * macosx/tkMacOSXWm.c (TkWmStackorderToplevelWrapperMap): Add
+    GetWindowFromPort() [Bug #812415]; make function static.
+
 2003-09-25  Daniel Steffen  <das@users.sourceforge.net>
 
 	* library/demos/widget: don't create iconwindow on aqua, but add
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index bad9c47..aa00e3a 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.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: tkMacOSXWm.c,v 1.7 2003/02/25 16:09:29 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.1 2003/09/26 16:19:52 cc_benny Exp $
  */
 #include <Carbon/Carbon.h>
 
@@ -72,6 +72,8 @@ static int		ParseGeometry _ANSI_ARGS_((Tcl_Interp *interp,
 			    char *string, TkWindow *winPtr));
 static void		TopLevelEventProc _ANSI_ARGS_((ClientData clientData,
 			    XEvent *eventPtr));
+static void             TkWmStackorderToplevelWrapperMap _ANSI_ARGS_((
+                            TkWindow *winPtr, Tcl_HashTable *table));
 static void		TopLevelReqProc _ANSI_ARGS_((ClientData dummy,
 			    Tk_Window tkwin));
 static void		UpdateGeometryInfo _ANSI_ARGS_((
@@ -5408,21 +5410,21 @@ TkpChangeFocus(winPtr, force)
  *
  *----------------------------------------------------------------------
  */
-void
+static void
 TkWmStackorderToplevelWrapperMap(winPtr, table)
     TkWindow *winPtr;				/* TkWindow to recurse on */
     Tcl_HashTable *table;			/* Maps mac window to TkWindow */
 {
     TkWindow *childPtr;
     Tcl_HashEntry *hPtr;
-    void *wrapper;
+    WindowRef macWindow;
     int newEntry;
 
     if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr)) {
-        wrapper = (void *) TkMacOSXGetDrawablePort(winPtr->window);
+        macWindow = GetWindowFromPort(TkMacOSXGetDrawablePort(winPtr->window));
 
         hPtr = Tcl_CreateHashEntry(table,
-            (char *) wrapper, &newEntry);
+            (const char *) macWindow, &newEntry);
         Tcl_SetHashValue(hPtr, winPtr);
     }
 
-- 
cgit v0.12