Import Tk 8.6.11
This commit is contained in:
@@ -550,6 +550,14 @@ EXTERN void TkDrawAngledChars(Display *display,
|
||||
Drawable drawable, GC gc, Tk_Font tkfont,
|
||||
const char *source, int numBytes, double x,
|
||||
double y, double angle);
|
||||
#ifdef MAC_OSX_TCL /* MACOSX */
|
||||
/* 185 */
|
||||
EXTERN void TkpRedrawWidget(Tk_Window tkwin);
|
||||
#endif /* MACOSX */
|
||||
#ifdef MAC_OSX_TCL /* MACOSX */
|
||||
/* 186 */
|
||||
EXTERN int TkpWillDrawWidget(Tk_Window tkwin);
|
||||
#endif /* MACOSX */
|
||||
|
||||
typedef struct TkIntStubs {
|
||||
int magic;
|
||||
@@ -767,6 +775,24 @@ typedef struct TkIntStubs {
|
||||
void (*tkUnderlineAngledTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int underline); /* 182 */
|
||||
int (*tkIntersectAngledTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height, double angle); /* 183 */
|
||||
void (*tkDrawAngledChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, double x, double y, double angle); /* 184 */
|
||||
#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
|
||||
void (*reserved185)(void);
|
||||
#endif /* UNIX */
|
||||
#if defined(_WIN32) /* WIN */
|
||||
void (*reserved185)(void);
|
||||
#endif /* WIN */
|
||||
#ifdef MAC_OSX_TCL /* MACOSX */
|
||||
void (*tkpRedrawWidget) (Tk_Window tkwin); /* 185 */
|
||||
#endif /* MACOSX */
|
||||
#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
|
||||
void (*reserved186)(void);
|
||||
#endif /* UNIX */
|
||||
#if defined(_WIN32) /* WIN */
|
||||
void (*reserved186)(void);
|
||||
#endif /* WIN */
|
||||
#ifdef MAC_OSX_TCL /* MACOSX */
|
||||
int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 186 */
|
||||
#endif /* MACOSX */
|
||||
} TkIntStubs;
|
||||
|
||||
extern const TkIntStubs *tkIntStubsPtr;
|
||||
@@ -1139,6 +1165,14 @@ extern const TkIntStubs *tkIntStubsPtr;
|
||||
(tkIntStubsPtr->tkIntersectAngledTextLayout) /* 183 */
|
||||
#define TkDrawAngledChars \
|
||||
(tkIntStubsPtr->tkDrawAngledChars) /* 184 */
|
||||
#ifdef MAC_OSX_TCL /* MACOSX */
|
||||
#define TkpRedrawWidget \
|
||||
(tkIntStubsPtr->tkpRedrawWidget) /* 185 */
|
||||
#endif /* MACOSX */
|
||||
#ifdef MAC_OSX_TCL /* MACOSX */
|
||||
#define TkpWillDrawWidget \
|
||||
(tkIntStubsPtr->tkpWillDrawWidget) /* 186 */
|
||||
#endif /* MACOSX */
|
||||
|
||||
#endif /* defined(USE_TK_STUBS) */
|
||||
|
||||
@@ -1160,6 +1194,14 @@ extern const TkIntStubs *tkIntStubsPtr;
|
||||
#undef TkSetRegion
|
||||
#undef TkSubtractRegion
|
||||
#undef TkUnionRectWithRegion
|
||||
#undef TkpCmapStressed_
|
||||
#undef TkpSync_
|
||||
#undef TkUnixContainerId_
|
||||
#undef TkUnixDoOneXEvent_
|
||||
#undef TkUnixSetMenubar_
|
||||
#undef TkWmCleanup_
|
||||
#undef TkSendCleanup_
|
||||
#undef TkpTestsendCmd_
|
||||
|
||||
#define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect)
|
||||
#define TkCreateRegion() (TkRegion) XCreateRegion()
|
||||
@@ -1175,5 +1217,12 @@ extern const TkIntStubs *tkIntStubsPtr;
|
||||
|
||||
#endif /* UNIX */
|
||||
|
||||
#if !defined(MAC_OSX_TK)
|
||||
# undef TkpWillDrawWidget
|
||||
# undef TkpRedrawWidget
|
||||
# define TkpWillDrawWidget(w) 0
|
||||
# define TkpRedrawWidget(w)
|
||||
#endif
|
||||
|
||||
#endif /* _TKINTDECLS */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user