Import Tk 8.6.8
This commit is contained in:
@@ -423,6 +423,7 @@ typedef struct TkDisplay {
|
||||
Atom windowAtom; /* Atom for TK_WINDOW. */
|
||||
Atom clipboardAtom; /* Atom for CLIPBOARD. */
|
||||
Atom utf8Atom; /* Atom for UTF8_STRING. */
|
||||
Atom atomPairAtom; /* Atom for ATOM_PAIR. */
|
||||
|
||||
Tk_Window clipWindow; /* Window used for clipboard ownership and to
|
||||
* retrieve selections between processes. NULL
|
||||
@@ -508,6 +509,9 @@ typedef struct TkDisplay {
|
||||
|
||||
int iconDataSize; /* Size of default iconphoto image data. */
|
||||
unsigned char *iconDataPtr; /* Default iconphoto image data, if set. */
|
||||
#ifdef TK_USE_INPUT_METHODS
|
||||
int ximGeneration; /* Used to invalidate XIC */
|
||||
#endif /* TK_USE_INPUT_METHODS */
|
||||
} TkDisplay;
|
||||
|
||||
/*
|
||||
@@ -809,6 +813,9 @@ typedef struct TkWindow {
|
||||
int minReqWidth; /* Minimum requested width. */
|
||||
int minReqHeight; /* Minimum requested height. */
|
||||
char *geometryMaster;
|
||||
#ifdef TK_USE_INPUT_METHODS
|
||||
int ximGeneration; /* Used to invalidate XIC */
|
||||
#endif /* TK_USE_INPUT_METHODS */
|
||||
} TkWindow;
|
||||
|
||||
/*
|
||||
@@ -1196,7 +1203,7 @@ MODULE_SCOPE void TkUnderlineCharsInContext(Display *display,
|
||||
const char *string, int numBytes, int x, int y,
|
||||
int firstByte, int lastByte);
|
||||
MODULE_SCOPE void TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont,
|
||||
Tcl_UniChar c, struct TkFontAttributes *faPtr);
|
||||
int c, struct TkFontAttributes *faPtr);
|
||||
MODULE_SCOPE Tcl_Obj * TkNewWindowObj(Tk_Window tkwin);
|
||||
MODULE_SCOPE void TkpShowBusyWindow(TkBusy busy);
|
||||
MODULE_SCOPE void TkpHideBusyWindow(TkBusy busy);
|
||||
@@ -1217,6 +1224,7 @@ MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp,
|
||||
MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp,
|
||||
ClientData clientData);
|
||||
MODULE_SCOPE void TkpWarpPointer(TkDisplay *dispPtr);
|
||||
MODULE_SCOPE void TkpCancelWarp(TkDisplay *dispPtr);
|
||||
MODULE_SCOPE int TkListCreateFrame(ClientData clientData,
|
||||
Tcl_Interp *interp, Tcl_Obj *listObj,
|
||||
int toplevel, Tcl_Obj *nameObj);
|
||||
@@ -1232,6 +1240,14 @@ MODULE_SCOPE Status TkParseColor (Display * display,
|
||||
MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion);
|
||||
#endif
|
||||
|
||||
#if TCL_UTF_MAX > 4
|
||||
# define TkUtfToUniChar Tcl_UtfToUniChar
|
||||
# define TkUniCharToUtf Tcl_UniCharToUtf
|
||||
#else
|
||||
MODULE_SCOPE int TkUtfToUniChar(const char *, int *);
|
||||
MODULE_SCOPE int TkUniCharToUtf(int, char *);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Unsupported commands.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user