diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-17 14:55:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-17 14:55:35 (GMT) |
| commit | d83dea17ecb2f74e3048b02992ce5e9c30573b12 (patch) | |
| tree | a975c0e201e4ad8e51341d6bb989c90f67aee7d9 /generic/tkInt.h | |
| parent | 3147ddd47a51d3ff290bc0be54646e541624c7fa (diff) | |
| parent | 3954d71d18d5d5aa61f21d4137726beb13a0047c (diff) | |
| download | tk-d83dea17ecb2f74e3048b02992ce5e9c30573b12.zip tk-d83dea17ecb2f74e3048b02992ce5e9c30573b12.tar.gz tk-d83dea17ecb2f74e3048b02992ce5e9c30573b12.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 5465a0e..c91b6d8 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -723,7 +723,7 @@ typedef struct TkWindow { Visual *visual; /* Visual to use for window. If not default, * MUST be set before X window is created. */ int depth; /* Number of bits/pixel. */ - Window window; /* X's id for window. NULL means window hasn't + Window window; /* X's id for window. None means window hasn't * actually been created yet, or it's been * deleted. */ struct TkWindow *childList; /* First in list of child windows, or NULL if @@ -1038,7 +1038,7 @@ typedef struct TkpClipMask { |Button6Mask|Button7Mask|Button8Mask|Button9Mask) -MODULE_SCOPE unsigned long TkGetButtonMask(unsigned int); +MODULE_SCOPE unsigned TkGetButtonMask(unsigned); /* * Object types not declared in tkObj.c need to be mentioned here so they can @@ -1324,6 +1324,10 @@ MODULE_SCOPE void TkpDrawCharsInContext(Display * display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, int rangeStart, int rangeLength, int x, int y); +MODULE_SCOPE void TkpDrawAngledCharsInContext(Display * display, + Drawable drawable, GC gc, Tk_Font tkfont, + const char *source, int numBytes, int rangeStart, + int rangeLength, double x, double y, double angle); MODULE_SCOPE int TkpMeasureCharsInContext(Tk_Font tkfont, const char *source, int numBytes, int rangeStart, int rangeLength, int maxLength, int flags, |