* macosx/tkMacOSXWm.c (TkWmMapWindow, InitialWindowBounds): fix use of

	potentially stale window position in initial configure event on first
	map of a window. [Bug 1476443]
	(TkMacOSXWindowOffset): use modern GetWindowStructureWidths API.

	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXMouseEvent.c (TkGenerateButtonEventForXPointer): new
	internal function to generate button events for current pointer
	directly, without requiring prior call to XQueryPointer().

	* macosx/tkMacOSXMouseEvent.c (XQueryPointer): implement return of
	window-local pointer position.

	* macosx/tkMacOSXInt.h:      use improvements above to avoid calls to
	* macosx/tkMacOSXKeyEvent.c: GlobalToLocal() when the current port might
	* macosx/tkMacOSXMenu.c:     not be set correctly. May fix [Bug 1243318]
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXScrlbr.c:

	* tkAboutDlg.r: update copyright.

	* macosx/tkMacOSXCarbonEvents.c: sync with HEAD
	* macosx/tkMacOSXDebug.c:
	* macosx/tkMacOSXDebug.h:
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXEvent.h:
	* macosx/tkMacOSXFont.h:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXSend.c:
	* macosx/tkMacOSXTest.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:

1 files changed, 25 insertions, 19 deletions

diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index d9f0ddd..87f5832 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.10 2006/04/11 07:36:40 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.11 2006/04/28 06:02:59 das Exp $
  */
 
 #ifndef _TKMACINT
@@ -31,6 +31,11 @@
 #include "tkMacOSX.h"
 #endif
 
+/* for source code parity with tk HEAD */
+#ifndef MODULE_SCOPE
+#define MODULE_SCOPE extern
+#endif
+
 struct TkWindowPrivate {
     TkWindow *winPtr;     	/* Ptr to tk window or NULL if Pixmap */
     CGrafPtr  grafPtr;
@@ -93,7 +98,7 @@ typedef struct {
 	Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc;
 } TkMacOSXEmbedHandler;
 
-extern TkMacOSXEmbedHandler *gMacEmbedHandler;
+MODULE_SCOPE TkMacOSXEmbedHandler *gMacEmbedHandler;
 
 /*
  * Defines used for TkMacOSXInvalidateWindow
@@ -126,17 +131,17 @@ extern TkMacOSXEmbedHandler *gMacEmbedHandler;
  * Globals shared among Macintosh Tk
  */
 
-extern MenuHandle tkAppleMenu;		/* Handle to the Apple Menu */
-extern MenuHandle tkFileMenu;		/* Handles to menus */
-extern MenuHandle tkEditMenu;		/* Handles to menus */
-extern RgnHandle tkMenuCascadeRgn;	/* A region to clip with. */
-extern int tkUseMenuCascadeRgn;		/* If this is 1, clipping code
+MODULE_SCOPE MenuHandle tkAppleMenu;	/* Handle to the Apple Menu */
+MODULE_SCOPE MenuHandle tkFileMenu;	/* Handles to menus */
+MODULE_SCOPE MenuHandle tkEditMenu;	/* Handles to menus */
+MODULE_SCOPE RgnHandle tkMenuCascadeRgn;/* A region to clip with. */
+MODULE_SCOPE int tkUseMenuCascadeRgn;	/* If this is 1, clipping code
 					 * should intersect tkMenuCascadeRgn
 					 * before drawing occurs.
 					 * tkMenuCascadeRgn will only
 					 * be valid when the value of this
 					 * variable is 1. */
-extern int tkPictureIsOpen;		/* If this is 1, we are drawing to a
+MODULE_SCOPE int tkPictureIsOpen;	/* If this is 1, we are drawing to a
 					 * picture The clipping should then be
 					 * done relative to the bounds of the
 					 * picture rather than the window. As
@@ -147,21 +152,22 @@ extern int tkPictureIsOpen;		/* If this is 1, we are drawing to a
 					 * for CopyBits should also have
 					 * top,left values of 0,0
 					 */
-extern TkMacOSXWindowList *tkMacOSXWindowListPtr;
+MODULE_SCOPE TkMacOSXWindowList *tkMacOSXWindowListPtr;
 					/* The list of toplevels */
 
-extern Tcl_Encoding TkMacOSXCarbonEncoding;
+MODULE_SCOPE Tcl_Encoding TkMacOSXCarbonEncoding;
 
-extern void TkMacOSXDisplayChanged(Display *display);
-extern int TkMacOSXUseAntialiasedText(Tcl_Interp *interp, int enable);
-extern void TkMacOSXInitCarbonEvents(Tcl_Interp *interp);
-extern int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable, int antiAlias);
-extern void TkMacOSXDefaultStartupScript(void);
-extern int TkMacOSXGenerateFocusEvent( Window window, int activeFlag);
-extern WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
-extern int TkMacOSXIsWindowZoomed(TkWindow *winPtr);
+MODULE_SCOPE void TkMacOSXDisplayChanged(Display *display);
+MODULE_SCOPE int TkMacOSXUseAntialiasedText(Tcl_Interp *interp, int enable);
+MODULE_SCOPE void TkMacOSXInitCarbonEvents(Tcl_Interp *interp);
+MODULE_SCOPE int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable, int antiAlias);
+MODULE_SCOPE void TkMacOSXDefaultStartupScript(void);
+MODULE_SCOPE int TkMacOSXGenerateFocusEvent( Window window, int activeFlag);
+MODULE_SCOPE WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
+MODULE_SCOPE int TkMacOSXIsWindowZoomed(TkWindow *winPtr);
+MODULE_SCOPE int TkGenerateButtonEventForXPointer(Window window);
 
-extern void* TkMacOSXGetNamedSymbol(const char* module, const char* symbol);
+MODULE_SCOPE void* TkMacOSXGetNamedSymbol(const char* module, const char* symbol);
 /* Macro to abstract common use of TkMacOSXGetNamedSymbol to initialize named symbols */
 #define TkMacOSXInitNamedSymbol(module, ret, symbol, ...) \
     static ret (* symbol)(__VA_ARGS__) = (void*)(-1L); \