* 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, 15 insertions, 15 deletions

diff --git a/macosx/tkMacOSXEvent.h b/macosx/tkMacOSXEvent.h
index 524d93e..6787f97 100644
--- a/macosx/tkMacOSXEvent.h
+++ b/macosx/tkMacOSXEvent.h
@@ -50,14 +50,14 @@
  *      software in accordance with the terms specified in this
  *      license.
  *
- * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.3.2.5 2006/03/28 02:44:13 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.3.2.6 2006/04/28 06:02:59 das Exp $
  */
 
 #ifndef _TKMACEVENT
 #define _TKMACEVENT
 
-#ifndef _TK
-#include "tk.h"
+#ifndef _TKMACINT
+#include "tkMacOSXInt.h"
 #endif
 
 typedef struct {
@@ -76,29 +76,29 @@ typedef struct {
     Tcl_Interp *interp; /* Interp to handle events in */
 } TkMacOSXEvent;
 
-OSStatus TkMacOSXReceiveAndProcessEvent();
-void TkMacOSXFlushWindows(); 
-int TkMacOSXProcessEvent(TkMacOSXEvent *eventPtr, 
+MODULE_SCOPE OSStatus TkMacOSXReceiveAndProcessEvent();
+MODULE_SCOPE void TkMacOSXFlushWindows(); 
+MODULE_SCOPE int TkMacOSXProcessEvent(TkMacOSXEvent *eventPtr, 
         MacEventStatus *statusPtr);
-int TkMacOSXProcessMouseEvent(TkMacOSXEvent *e,
+MODULE_SCOPE int TkMacOSXProcessMouseEvent(TkMacOSXEvent *e,
         MacEventStatus *statusPtr);
-int TkMacOSXProcessWindowEvent(TkMacOSXEvent *e,
+MODULE_SCOPE int TkMacOSXProcessWindowEvent(TkMacOSXEvent *e,
         MacEventStatus *statusPtr);
-int TkMacOSXProcessKeyboardEvent(TkMacOSXEvent *e,
+MODULE_SCOPE int TkMacOSXProcessKeyboardEvent(TkMacOSXEvent *e,
         MacEventStatus *statusPtr);
-int TkMacOSXProcessApplicationEvent(TkMacOSXEvent *e,
+MODULE_SCOPE int TkMacOSXProcessApplicationEvent(TkMacOSXEvent *e,
         MacEventStatus *statusPtr);
-int TkMacOSXProcessMenuEvent(TkMacOSXEvent *e,
+MODULE_SCOPE int TkMacOSXProcessMenuEvent(TkMacOSXEvent *e,
         MacEventStatus *statusPtr);
-int TkMacOSXProcessCommandEvent(TkMacOSXEvent *e,
+MODULE_SCOPE int TkMacOSXProcessCommandEvent(TkMacOSXEvent *e,
         MacEventStatus *statusPtr);
-int TkMacOSXKeycodeToUnicode(
+MODULE_SCOPE int TkMacOSXKeycodeToUnicode(
         UniChar * uniChars, int maxChars,
         EventKind eKind,
         UInt32 keycode, UInt32 modifiers,
         UInt32 * deadKeyStatePtr);
-OSStatus TkMacOSXStartTclEventLoopCarbonTimer();
-OSStatus TkMacOSXStopTclEventLoopCarbonTimer();
+MODULE_SCOPE OSStatus TkMacOSXStartTclEventLoopCarbonTimer();
+MODULE_SCOPE OSStatus TkMacOSXStopTclEventLoopCarbonTimer();
 
 #if !defined(MAC_OS_X_VERSION_10_3) || \
         (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)