summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXEvent.h
diff options
context:
space:
mode:
authordas <das>2006-04-28 06:02:47 (GMT)
committerdas <das>2006-04-28 06:02:47 (GMT)
commit37574f162488e058bcba4d8378c94a18716b7af1 (patch)
treedbf40a74ecf59b8ccec931d28b36eb0dfdafb1a1 /macosx/tkMacOSXEvent.h
parentc5df89036d559ebb962065ca285fa46f6828db56 (diff)
downloadtk-37574f162488e058bcba4d8378c94a18716b7af1.zip
tk-37574f162488e058bcba4d8378c94a18716b7af1.tar.gz
tk-37574f162488e058bcba4d8378c94a18716b7af1.tar.bz2
* 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/tkMacOSXDebug.h: sync #includes with core-8-4-branch. * macosx/tkMacOSXEvent.h: * macosx/tkMacOSXFont.h:
Diffstat (limited to 'macosx/tkMacOSXEvent.h')
-rw-r--r--macosx/tkMacOSXEvent.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/tkMacOSXEvent.h b/macosx/tkMacOSXEvent.h
index 8219a36..00f1963 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.9 2006/03/28 02:43:24 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.10 2006/04/28 06:02:48 das Exp $
*/
#ifndef _TKMACEVENT
#define _TKMACEVENT
-#ifndef _TK
-#include "tk.h"
+#ifndef _TKMACINT
+#include "tkMacOSXInt.h"
#endif
typedef struct {