diff options
| author | das <das> | 2006-04-28 06:02:47 (GMT) |
|---|---|---|
| committer | das <das> | 2006-04-28 06:02:47 (GMT) |
| commit | 37574f162488e058bcba4d8378c94a18716b7af1 (patch) | |
| tree | dbf40a74ecf59b8ccec931d28b36eb0dfdafb1a1 /macosx/tkMacOSXFont.h | |
| parent | c5df89036d559ebb962065ca285fa46f6828db56 (diff) | |
| download | tk-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/tkMacOSXFont.h')
| -rw-r--r-- | macosx/tkMacOSXFont.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/tkMacOSXFont.h b/macosx/tkMacOSXFont.h index 9856722..22555a5 100644 --- a/macosx/tkMacOSXFont.h +++ b/macosx/tkMacOSXFont.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: tkMacOSXFont.h,v 1.3 2006/03/28 02:43:24 das Exp $ + * RCS: @(#) $Id: tkMacOSXFont.h,v 1.4 2006/04/28 06:02:48 das Exp $ */ #ifndef TKMACOSXFONT_H @@ -17,7 +17,9 @@ #include "tkFont.h" -#include <Carbon/Carbon.h> +#ifndef _TKMACINT +#include "tkMacOSXInt.h" +#endif /* * Switches @@ -92,7 +94,6 @@ typedef struct {} DrawingContext; #endif /* ? TK_MAC_USE_QUARZ */ - /* * Function prototypes */ @@ -110,5 +111,4 @@ MODULE_SCOPE void TkMacOSXQuarzEndDraw( TkMacOSXFontDrawingContext * contextPtr); #endif /* TK_MAC_USE_QUARZ */ - #endif /*TKMACOSXFONT_H*/ |