diff options
| -rw-r--r-- | generic/tk.h | 4 | ||||
| -rw-r--r-- | generic/tkInt.decls | 876 | ||||
| -rw-r--r-- | generic/tkInt.h | 11 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 90 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 147 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 896 | ||||
| -rw-r--r-- | generic/tkPkgConfig.c | 8 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 243 | ||||
| -rw-r--r-- | tests/embed.test | 10 | ||||
| -rw-r--r-- | tests/menu.test | 32 | ||||
| -rw-r--r-- | tests/unixEmbed.test | 18 | ||||
| -rw-r--r-- | xlib/X11/keysymdef.h | 24 |
12 files changed, 298 insertions, 2061 deletions
diff --git a/generic/tk.h b/generic/tk.h index 32fcc17..9678a06 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -743,10 +743,6 @@ typedef XActivateDeactivateEvent XDeactivateEvent; (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE) #define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth) #define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight) -#ifndef TK_NO_DEPRECATED -#define Tk_InternalBorderWidth(tkwin) \ - (((Tk_FakeWin *) (tkwin))->internalBorderLeft) -#endif /* !TK_NO_DEPRECATED */ #define Tk_InternalBorderLeft(tkwin) \ (((Tk_FakeWin *) (tkwin))->internalBorderLeft) #define Tk_InternalBorderRight(tkwin) \ diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 78e6cf2..e056e3f 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -226,9 +226,6 @@ declare 58 { declare 59 { void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name) } -declare 60 {deprecated {renamed to Tk_GetOtherWindow}} { - TkWindow *TkpGetOtherWindow(TkWindow *winPtr) -} declare 61 { TkWindow *TkpGetWrapperWindow(TkWindow *winPtr) } @@ -239,15 +236,9 @@ declare 63 { void TkpInitializeMenuBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable) } -declare 64 {deprecated {renamed to Tk_MakeContainer}} { - void TkpMakeContainer(Tk_Window tkwin) -} declare 65 { void TkpMakeMenuWindow(Tk_Window tkwin, int transient) } -declare 66 {deprecated {renamed to Tk_MakeWindow}} { - Window TkpMakeWindow(TkWindow *winPtr, Window parent) -} declare 67 { void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, const char *menuName) } @@ -269,15 +260,6 @@ declare 72 { declare 73 { void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } -declare 74 {deprecated {renamed to Tk_SetMainMenubar}} { - void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, const char *menuName) -} -declare 75 {deprecated {renamed to Tk_UseWindow}} { - int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string) -} -# -# Slot 76 unused (WAS: TkpWindowWasRecentlyDeleted) -# declare 77 { void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr) } @@ -302,16 +284,6 @@ declare 82 { declare 83 { void TkSelPropProc(XEvent *eventPtr) } - -# Exported publically as Tk_SetClassProcs in 8.4a2 -#declare 84 { -# void TkSetClassProcs(Tk_Window tkwin, -# TkClassProcs *procs, void *instanceData) -#} -declare 85 {deprecated {renamed to Tk_SetWindowMenubar}} { - void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin, - const char *oldMenuName, const char *menuName) -} declare 86 { KeySym TkStringToKeysym(const char *name) } @@ -394,10 +366,6 @@ declare 109 { declare 110 { void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont) } -declare 111 {deprecated {renamed to Tk_GetSystemDefault}} { - Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin, - const char *dbName, const char *className) -} declare 112 { void TkpMenuThreadInit(void) } @@ -434,10 +402,6 @@ declare 124 aqua { Pixmap TkpGetNativeAppBitmap(Display *display, const char *name, int *width, int *height) } -declare 135 {deprecated {renamed to Tk_DrawHighlightBorder}} { - void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC, - int highlightWidth, Drawable drawable) -} declare 136 { void TkSetFocusWin(TkWindow *winPtr, int force) } @@ -666,58 +630,36 @@ declare 0 x11 { declare 2 x11 { void TkGenerateActivateEvents(TkWindow *winPtr, int active) } -declare 3 x11 { - int TkpCmapStressed(Tk_Window tkwin, Colormap colormap) -} -declare 4 x11 { - void TkpSync(Display *display) -} -declare 5 x11 { - Window TkUnixContainerId(TkWindow *winPtr) -} -declare 6 x11 { - int TkUnixDoOneXEvent(Tcl_Time *timePtr) -} -declare 7 x11 { - void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar) -} declare 8 x11 { int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr) } declare 9 x11 { void TkWmCleanup(TkDisplay *dispPtr) } -declare 10 x11 { - void TkSendCleanup(TkDisplay *dispPtr) -} declare 12 x11 { int TkpWmSetState(TkWindow *winPtr, int state) } # only needed by tktest: -declare 13 x11 { - int TkpTestsendCmd_(void *clientData, Tcl_Interp *interp, Tcl_Size objc, - Tcl_Obj *const objv[]) -} declare 38 x11 { - int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap) + int TkpCmapStressed(Tk_Window tkwin, Colormap colormap) } declare 39 x11 { - void TkpSync_(Display *display) + void TkpSync(Display *display) } declare 40 x11 { - Window TkUnixContainerId_(TkWindow *winPtr) + Window TkUnixContainerId(TkWindow *winPtr) } declare 41 x11 { - int TkUnixDoOneXEvent_(Tcl_Time *timePtr) + int TkUnixDoOneXEvent(Tcl_Time *timePtr) } declare 42 x11 { - void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar) + void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar) } declare 43 x11 { - void TkWmCleanup_(TkDisplay *dispPtr) + void TkWmCleanup(TkDisplay *dispPtr) } declare 44 x11 { - void TkSendCleanup_(TkDisplay *dispPtr) + void TkSendCleanup(TkDisplay *dispPtr) } # only needed by tktest: declare 45 x11 { @@ -885,11 +827,8 @@ declare 47 win { ################################ # Aqua specific functions -declare 0 aqua { - void TkGenerateActivateEvents(TkWindow *winPtr, int active) -} declare 2 aqua { - void TkGenerateActivateEvents_(TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } declare 3 aqua { void TkPointerDeadWindow(TkWindow *winPtr) @@ -948,9 +887,6 @@ declare 18 aqua { declare 21 aqua { void TkMacOSXInvalidateWindow(MacDrawable *macWin, int flag) } -declare 22 aqua { - int TkMacOSXIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) -} declare 23 aqua { void TkMacOSXMakeRealWindowExist(TkWindow *winPtr) } @@ -973,9 +909,6 @@ declare 28 aqua { declare 29 aqua { void TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag) } -declare 30 aqua { - void TkMacOSXSetUpClippingRgn(Drawable drawable) -} declare 31 aqua { void TkMacOSXSetUpGraphicsPort(GC gc, void *destPort) } @@ -1057,413 +990,413 @@ declare 55 aqua { interface tkIntXlib ################################ -# X functions for Windows +# X functions -declare 0 win { +declare 0 { int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n) } -declare 1 win { +declare 1 { XModifierKeymap *XGetModifierMapping(Display *d) } -declare 2 win { +declare 2 { XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4) } -declare 3 win { +declare 3 { XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } -declare 4 win { +declare 4 { char *XGetAtomName(Display *d, Atom a) } -declare 5 win { +declare 5 { char *XKeysymToString(KeySym k) } -declare 6 win { +declare 6 { Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) } -declare 7 win { +declare 7 { Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) } -declare 8 win { +declare 8 { Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2) } -declare 9 win { +declare 9 { GContext XGContextFromGC(GC g) } -declare 10 win { +declare 10 { XHostAddress *XListHosts(Display *d, int *i, Bool *b) } # second parameter was of type KeyCode -declare 11 win { +declare 11 { KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i) } -declare 12 win { +declare 12 { KeySym XStringToKeysym(_Xconst char *c) } -declare 13 win { +declare 13 { Window XRootWindow(Display *d, int i) } -declare 14 win { +declare 14 { XErrorHandler XSetErrorHandler(XErrorHandler x) } -declare 15 win { +declare 15 { Status XIconifyWindow(Display *d, Window w, int i) } -declare 16 win { +declare 16 { Status XWithdrawWindow(Display *d, Window w, int i) } -declare 17 win { +declare 17 { Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip) } -declare 18 win { +declare 18 { Status XAllocColor(Display *d, Colormap c, XColor *xp) } -declare 19 win { +declare 19 { int XBell(Display *d, int i) } -declare 20 win { +declare 20 { int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3) } -declare 21 win { +declare 21 { int XChangeWindowAttributes(Display *d, Window w, unsigned long ul, XSetWindowAttributes *x) } -declare 22 win { +declare 22 { int XClearWindow(Display *d, Window w) } -declare 23 win { +declare 23 { int XConfigureWindow(Display *d, Window w, unsigned int i, XWindowChanges *x) } -declare 24 win { +declare 24 { int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 25 win { +declare 25 { int XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } -declare 26 win { +declare 26 { Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height) } -declare 27 win { +declare 27 { int XDefineCursor(Display *d, Window w, Cursor c) } -declare 28 win { +declare 28 { int XDeleteProperty(Display *d, Window w, Atom a) } -declare 29 win { +declare 29 { int XDestroyWindow(Display *d, Window w) } -declare 30 win { +declare 30 { int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 31 win { +declare 31 { int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } -declare 32 win { +declare 32 { int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } -declare 33 win { +declare 33 { int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 34 win { +declare 34 { int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } -declare 35 win { +declare 35 { int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } -declare 36 win { +declare 36 { int XForceScreenSaver(Display *d, int i) } -declare 37 win { +declare 37 { int XFreeColormap(Display *d, Colormap c) } -declare 38 win { +declare 38 { int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul) } -declare 39 win { +declare 39 { int XFreeCursor(Display *d, Cursor c) } -declare 40 win { +declare 40 { int XFreeModifiermap(XModifierKeymap *x) } -declare 41 win { +declare 41 { Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4) } -declare 42 win { +declare 42 { int XGetInputFocus(Display *d, Window *w, int *i) } -declare 43 win { +declare 43 { int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp) } -declare 44 win { +declare 44 { Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x) } -declare 45 win { +declare 45 { int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) } -declare 46 win { +declare 46 { int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t) } -declare 47 win { +declare 47 { KeyCode XKeysymToKeycode(Display *d, KeySym k) } -declare 48 win { +declare 48 { Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2) } -declare 49 win { +declare 49 { int XMapWindow(Display *d, Window w) } -declare 50 win { +declare 50 { int XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } -declare 51 win { +declare 51 { int XMoveWindow(Display *d, Window w, int i1, int i2) } -declare 52 win { +declare 52 { int XNextEvent(Display *d, XEvent *x) } -declare 53 win { +declare 53 { int XPutBackEvent(Display *d, XEvent *x) } -declare 54 win { +declare 54 { int XQueryColors(Display *d, Colormap c, XColor *x, int i) } -declare 55 win { +declare 55 { Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } -declare 56 win { +declare 56 { Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui) } -declare 57 win { +declare 57 { int XRaiseWindow(Display *d, Window w) } -declare 58 win { +declare 58 { int XRefreshKeyboardMapping(XMappingEvent *x) } -declare 59 win { +declare 59 { int XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } -declare 60 win { +declare 60 { int XSelectInput(Display *d, Window w, long l) } -declare 61 win { +declare 61 { Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } -declare 62 win { +declare 62 { int XSetCommand(Display *d, Window w, char **c, int i) } -declare 63 win { +declare 63 { int XSetIconName(Display *d, Window w, _Xconst char *c) } -declare 64 win { +declare 64 { int XSetInputFocus(Display *d, Window w, int i, Time t) } -declare 65 win { +declare 65 { int XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } -declare 66 win { +declare 66 { int XSetWindowBackground(Display *d, Window w, unsigned long ul) } -declare 67 win { +declare 67 { int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } -declare 68 win { +declare 68 { int XSetWindowBorder(Display *d, Window w, unsigned long ul) } -declare 69 win { +declare 69 { int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } -declare 70 win { +declare 70 { int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } -declare 71 win { +declare 71 { int XSetWindowColormap(Display *d, Window w, Colormap c) } -declare 72 win { +declare 72 { Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3) } -declare 73 win { +declare 73 { int XUngrabKeyboard(Display *d, Time t) } -declare 74 win { +declare 74 { int XUngrabPointer(Display *d, Time t) } -declare 75 win { +declare 75 { int XUnmapWindow(Display *d, Window w) } -declare 76 win { +declare 76 { int XWindowEvent(Display *d, Window w, long l, XEvent *x) } -declare 77 win { +declare 77 { void XDestroyIC(XIC x) } -declare 78 win { +declare 78 { Bool XFilterEvent(XEvent *x, Window w) } -declare 79 win { +declare 79 { int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s) } -declare 80 win { +declare 80 { int TkPutImage(unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height) } -declare 81 win { +declare 81 { int XSetClipRectangles(Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering) } -declare 82 win { +declare 82 { Status XParseColor(Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr) } -declare 83 win { +declare 83 { GC XCreateGC(Display *display, Drawable d, unsigned long valuemask, XGCValues *values) } -declare 84 win { +declare 84 { int XFreeGC(Display *display, GC gc) } -declare 85 win { +declare 85 { Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } -declare 86 win { +declare 86 { int XSetBackground(Display *display, GC gc, unsigned long foreground) } -declare 87 win { +declare 87 { int XSetForeground(Display *display, GC gc, unsigned long foreground) } -declare 88 win { +declare 88 { int XSetClipMask(Display *display, GC gc, Pixmap pixmap) } -declare 89 win { +declare 89 { int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } -declare 90 win { +declare 90 { int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } -declare 91 win { +declare 91 { int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } -declare 92 win { +declare 92 { int XSetFont(Display *display, GC gc, Font font) } -declare 93 win { +declare 93 { int XSetArcMode(Display *display, GC gc, int arc_mode) } -declare 94 win { +declare 94 { int XSetStipple(Display *display, GC gc, Pixmap stipple) } -declare 95 win { +declare 95 { int XSetFillRule(Display *display, GC gc, int fill_rule) } -declare 96 win { +declare 96 { int XSetFillStyle(Display *display, GC gc, int fill_style) } -declare 97 win { +declare 97 { int XSetFunction(Display *display, GC gc, int function) } -declare 98 win { +declare 98 { int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style) } -declare 99 win { +declare 99 { int _XInitImageFuncPtrs(XImage *image) } -declare 100 win { +declare 100 { XIC XCreateIC(XIM xim, ...) } -declare 101 win { +declare 101 { XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return) } -declare 102 win { +declare 102 { void XSetWMClientMachine(Display *display, Window w, XTextProperty *text_prop) } -declare 103 win { +declare 103 { Status XStringListToTextProperty(char **list, int count, XTextProperty *text_prop_return) } -declare 104 win { +declare 104 { int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } -declare 105 win { +declare 105 { int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy) } -declare 106 win { +declare 106 { int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } # New in Tk 8.6 -declare 107 win { +declare 107 { int XFlush(Display *display) } -declare 108 win { +declare 108 { int XGrabServer(Display *display) } -declare 109 win { +declare 109 { int XUngrabServer(Display *display) } -declare 110 win { +declare 110 { int XFree(void *data) } -declare 111 win { +declare 111 { int XNoOp(Display *display) } -declare 112 win { +declare 112 { XAfterFunction XSynchronize(Display *display, Bool onoff) } -declare 113 win { +declare 113 { int XSync(Display *display, Bool discard) } -declare 114 win { +declare 114 { VisualID XVisualIDFromVisual(Visual *visual) } # For tktreectrl -declare 120 win { +declare 120 { int XOffsetRegion(Region rgn, int dx, int dy) } -declare 121 win { +declare 121 { int XUnionRegion(Region srca, Region srcb, Region dr_return) } # For 3dcanvas -declare 122 win { +declare 122 { Window XCreateWindow(Display *display, Window parent, int x, int y, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int clazz, @@ -1472,593 +1405,92 @@ declare 122 win { } # Various, e.g. for stub-enabled BLT -declare 129 win { +declare 129 { int XLowerWindow(Display *d, Window w) } -declare 130 win { +declare 130 { int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n) } -declare 131 win { +declare 131 { int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n) } -declare 132 win { +declare 132 { int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n) } -declare 133 win { +declare 133 { int XDrawSegments(Display *d, Drawable dr, GC gc, XSegment *s, int n) } -declare 134 win { +declare 134 { int XDrawPoint(Display *d, Drawable dr, GC gc, int x, int y) } -declare 135 win { +declare 135 { int XDrawPoints(Display *d, Drawable dr, GC gc, XPoint *p, int n, int m) } -declare 136 win { +declare 136 { int XReparentWindow(Display *d, Window w, Window p, int x, int y) } -declare 137 win { +declare 137 { int XPutImage(Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h) } -declare 138 win { +declare 138 { Region XPolygonRegion(XPoint *pts, int n, int rule) } -declare 139 win { +declare 139 { int XPointInRegion(Region rgn, int x, int y) } # For XIM -declare 140 win { - XVaNestedList XVaCreateNestedList(int dummy, ...) -} -declare 141 win { - char *XSetICValues(XIC xic, ...) -} -declare 142 win { - char *XGetICValues(XIC xic, ...) -} -declare 143 win { - void XSetICFocus(XIC xic) -} -declare 147 win { - void XFreeFontSet(Display *display, XFontSet fontset) -} -declare 148 win { - int XCloseIM(XIM im) -} -declare 149 win { - Bool XRegisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd, - char *res_name, char *res_class, XIDProc callback, XPointer client_data) -} -declare 150 win { - Bool XUnregisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd, - char *res_name, char *res_class, XIDProc callback, XPointer client_data) -} -declare 151 win { - char *XSetLocaleModifiers(const char *modifier_list) -} -declare 152 win { - XIM XOpenIM(Display *dpy, struct _XrmHashBucketRec *rdb, char *res_name, - char *res_class) -} -declare 153 win { - char *XGetIMValues(XIM im, ...) -} -declare 154 win { - char *XSetIMValues(XIM im, ...) -} -declare 155 win { - XFontSet XCreateFontSet(Display *display, _Xconst char *base_font_name_list, - char ***missing_charset_list, int *missing_charset_count, char **def_string) -} -declare 156 win { - void XFreeStringList(char **list) -} -declare 157 win { - KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i) -} -declare 158 win { - Display *XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn, - int *major_rtrn, int *minor_rtrn, int *reason) -} - -################################ -# X functions for MacOSX - -declare 0 macosx { - int XSetDashes(Display *display, GC gc, int dash_offset, - _Xconst char *dash_list, int n) -} -declare 1 macosx { - XModifierKeymap *XGetModifierMapping(Display *d) -} -declare 2 macosx { - XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, - int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, - int i4) -} -declare 3 macosx { - XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, - unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) -} -declare 4 macosx { - char *XGetAtomName(Display *d, Atom a) -} -declare 5 macosx { - char *XKeysymToString(KeySym k) -} -declare 6 macosx { - Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) -} -declare 7 macosx { - GContext XGContextFromGC(GC g) -} -# second parameter was of type KeyCode -declare 8 macosx { - KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i) -} -declare 9 macosx { - KeySym XStringToKeysym(_Xconst char *c) -} -declare 10 macosx { - Window XRootWindow(Display *d, int i) -} -declare 11 macosx { - XErrorHandler XSetErrorHandler(XErrorHandler x) -} -declare 12 macosx { - Status XAllocColor(Display *d, Colormap c, XColor *xp) -} -declare 13 macosx { - int XBell(Display *d, int i) -} -declare 14 macosx { - int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, - int i2, _Xconst unsigned char *c, int i3) -} -declare 15 macosx { - int XChangeWindowAttributes(Display *d, Window w, unsigned long ul, - XSetWindowAttributes *x) -} -declare 16 macosx { - int XConfigureWindow(Display *d, Window w, unsigned int i, - XWindowChanges *x) -} -declare 17 macosx { - int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, - int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) -} -declare 18 macosx { - int XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, - int i2, unsigned int ui1, - unsigned int ui2, int i3, int i4, unsigned long ul) -} -declare 19 macosx { - Pixmap XCreateBitmapFromData(Display *display, Drawable d, - _Xconst char *data, unsigned int width, unsigned int height) -} -declare 20 macosx { - int XDefineCursor(Display *d, Window w, Cursor c) -} -declare 21 macosx { - int XDestroyWindow(Display *d, Window w) -} -declare 22 macosx { - int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, int i4) -} -declare 23 macosx { - int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) -} -declare 24 macosx { - int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2) -} -declare 25 macosx { - int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, int i4) -} -declare 26 macosx { - int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, - int i1, int i2, int i3) -} -declare 27 macosx { - int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) -} -declare 28 macosx { - int XFreeColormap(Display *d, Colormap c) -} -declare 29 macosx { - int XFreeColors(Display *d, Colormap c, - unsigned long *ulp, int i, unsigned long ul) -} -declare 30 macosx { - int XFreeModifiermap(XModifierKeymap *x) -} -declare 31 macosx { - Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, - int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, - unsigned int *ui4) -} -declare 32 macosx { - int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, - Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, - unsigned long *ulp2, unsigned char **cpp) -} -declare 33 macosx { - int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) -} -declare 34 macosx { - int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, - int i1, int i2, Window w2, Cursor c, Time t) -} -declare 35 macosx { - KeyCode XKeysymToKeycode(Display *d, KeySym k) -} -declare 36 macosx { - int XMapWindow(Display *d, Window w) -} -declare 37 macosx { - int XMoveResizeWindow(Display *d, Window w, int i1, int i2, - unsigned int ui1, unsigned int ui2) -} -declare 38 macosx { - int XMoveWindow(Display *d, Window w, int i1, int i2) -} -declare 39 macosx { - Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, - int *i1, int *i2, int *i3, int *i4, unsigned int *ui) -} -declare 40 macosx { - int XRaiseWindow(Display *d, Window w) -} -declare 41 macosx { - int XRefreshKeyboardMapping(XMappingEvent *x) -} -declare 42 macosx { - int XResizeWindow(Display *d, Window w, unsigned int ui1, - unsigned int ui2) -} -declare 43 macosx { - int XSelectInput(Display *d, Window w, long l) -} -declare 44 macosx { - Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) -} -declare 45 macosx { - int XSetIconName(Display *d, Window w, _Xconst char *c) -} -declare 46 macosx { - int XSetInputFocus(Display *d, Window w, int i, Time t) -} -declare 47 macosx { - int XSetSelectionOwner(Display *d, Atom a, Window w, Time t) -} -declare 48 macosx { - int XSetWindowBackground(Display *d, Window w, unsigned long ul) -} -declare 49 macosx { - int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) -} -declare 50 macosx { - int XSetWindowBorder(Display *d, Window w, unsigned long ul) -} -declare 51 macosx { - int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) -} -declare 52 macosx { - int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) -} -declare 53 macosx { - int XSetWindowColormap(Display *d, Window w, Colormap c) -} -declare 54 macosx { - int XUngrabKeyboard(Display *d, Time t) -} -declare 55 macosx { - int XUngrabPointer(Display *d, Time t) -} -declare 56 macosx { - int XUnmapWindow(Display *d, Window w) -} -declare 57 macosx { - int TkPutImage(unsigned long *colors, int ncolors, Display *display, - Drawable d, GC gc, XImage *image, int src_x, int src_y, - int dest_x, int dest_y, unsigned int width, unsigned int height) -} -declare 58 macosx { - Status XParseColor(Display *display, Colormap map, - _Xconst char *spec, XColor *colorPtr) -} -declare 59 macosx { - GC XCreateGC(Display *display, Drawable d, - unsigned long valuemask, XGCValues *values) -} -declare 60 macosx { - int XFreeGC(Display *display, GC gc) -} -declare 61 macosx { - Atom XInternAtom(Display *display, _Xconst char *atom_name, - Bool only_if_exists) -} -declare 62 macosx { - int XSetBackground(Display *display, GC gc, unsigned long foreground) -} -declare 63 macosx { - int XSetForeground(Display *display, GC gc, unsigned long foreground) -} -declare 64 macosx { - int XSetClipMask(Display *display, GC gc, Pixmap pixmap) -} -declare 65 macosx { - int XSetClipOrigin(Display *display, GC gc, - int clip_x_origin, int clip_y_origin) -} -declare 66 macosx { - int XSetTSOrigin(Display *display, GC gc, - int ts_x_origin, int ts_y_origin) -} -declare 67 macosx { - int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) -} -declare 68 macosx { - int XSetFont(Display *display, GC gc, Font font) -} -declare 69 macosx { - int XSetArcMode(Display *display, GC gc, int arc_mode) -} -declare 70 macosx { - int XSetStipple(Display *display, GC gc, Pixmap stipple) -} -declare 71 macosx { - int XSetFillRule(Display *display, GC gc, int fill_rule) -} -declare 72 macosx { - int XSetFillStyle(Display *display, GC gc, int fill_style) -} -declare 73 macosx { - int XSetFunction(Display *display, GC gc, int function) -} -declare 74 macosx { - int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, - int line_style, int cap_style, int join_style) -} -declare 75 macosx { - int _XInitImageFuncPtrs(XImage *image) -} -declare 76 macosx { - XIC XCreateIC(XIM xim, ...) -} -declare 77 macosx { - XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, - XVisualInfo *vinfo_template, int *nitems_return) -} -declare 78 macosx { - void XSetWMClientMachine(Display *display, Window w, - XTextProperty *text_prop) -} -declare 79 macosx { - Status XStringListToTextProperty(char **list, int count, - XTextProperty *text_prop_return) -} -declare 80 macosx { - int XDrawSegments(Display *display, Drawable d, GC gc, - XSegment *segments, int nsegments) -} -declare 81 macosx { - int XForceScreenSaver(Display *display, int mode) -} -declare 82 macosx { - int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, - int x2, int y2) -} -declare 83 macosx { - int XFillRectangle(Display *display, Drawable d, GC gc, - int x, int y, unsigned int width, unsigned int height) -} -declare 84 macosx { - int XClearWindow(Display *d, Window w) -} -declare 85 macosx { - int XDrawPoint(Display *display, Drawable d, GC gc, int x, int y) -} -declare 86 macosx { - int XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points, - int npoints, int mode) -} -declare 87 macosx { - int XWarpPointer(Display *display, Window src_w, Window dest_w, - int src_x, int src_y, unsigned int src_width, - unsigned int src_height, int dest_x, int dest_y) -} -declare 88 macosx { - int XQueryColor(Display *display, Colormap colormap, XColor *def_in_out) -} -declare 89 macosx { - int XQueryColors(Display *display, Colormap colormap, - XColor *defs_in_out, int ncolors) -} -declare 90 macosx { - Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, - Window **w4, unsigned int *ui) -} -declare 91 macosx { - int XSync(Display *display, Bool discard) -} -declare 92 macosx { - Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1, - int i2, int *i3, int *i4, Window *w3) -} -declare 93 macosx { - int XDeleteProperty(Display *d, Window w, Atom a) -} -declare 94 macosx { - int XFreeCursor(Display *d, Cursor c) -} -declare 95 macosx { - int XGetInputFocus(Display *d, Window *w, int *i) -} -declare 96 macosx { - int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i, - KeySym *k, Status *s) -} -declare 97 macosx { - int XNextEvent(Display *d, XEvent *x) -} -declare 98 macosx { - int XPutBackEvent(Display *d, XEvent *x) -} -declare 99 macosx { - int XSetCommand(Display *d, Window w, char **c, int i) -} -declare 100 macosx { - int XWindowEvent(Display *d, Window w, long l, XEvent *x) -} -declare 101 macosx { - Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x) -} -declare 102 macosx { - Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip) -} -declare 103 macosx { - Status XIconifyWindow(Display *d, Window w, int i) -} -declare 104 macosx { - Status XWithdrawWindow(Display *d, Window w, int i) -} -declare 105 macosx { - XHostAddress *XListHosts(Display *d, int *i, Bool *b) -} -declare 106 macosx { - int XSetClipRectangles(Display *display, GC gc, int clip_x_origin, - int clip_y_origin, XRectangle rectangles[], int n, int ordering) -} -declare 107 macosx { - int XFlush(Display *display) -} -declare 108 macosx { - int XGrabServer(Display *display) -} -declare 109 macosx { - int XUngrabServer(Display *display) -} -declare 110 macosx { - int XFree(void *data) -} -declare 111 macosx { - int XNoOp(Display *display) -} -declare 112 macosx { - XAfterFunction XSynchronize(Display *display, Bool onoff) -} -declare 113 macosx { - Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, - XColor *x1, XColor *x2) -} -declare 114 macosx { - VisualID XVisualIDFromVisual(Visual *visual) -} -declare 120 macosx { - int XOffsetRegion(Region rgn, int dx, int dy) -} -declare 121 macosx { - int XUnionRegion(Region srca, Region srcb, Region dr_return) -} -declare 122 macosx { - Window XCreateWindow(Display *display, Window parent, int x, int y, - unsigned int width, unsigned int height, - unsigned int border_width, int depth, unsigned int clazz, - Visual *visual, unsigned long value_mask, - XSetWindowAttributes *attributes) -} -declare 129 macosx { - int XLowerWindow(Display *d, Window w) -} -declare 130 macosx { - int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n) -} -declare 131 macosx { - int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n) -} -declare 132 macosx { - int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n) -} -declare 136 macosx { - int XReparentWindow(Display *d, Window w, Window p, int x, int y) -} -declare 137 macosx { - int XPutImage(Display *d, Drawable dr, GC gc, XImage *im, - int sx, int sy, int dx, int dy, - unsigned int w, unsigned int h) -} -declare 138 macosx { - Region XPolygonRegion(XPoint *pts, int n, int rule) -} -declare 139 macosx { - int XPointInRegion(Region rgn, int x, int y) -} -declare 140 macosx { +declare 140 { XVaNestedList XVaCreateNestedList(int dummy, ...) } -declare 141 macosx { +declare 141 { char *XSetICValues(XIC xic, ...) } -declare 142 macosx { +declare 142 { char *XGetICValues(XIC xic, ...) } -declare 143 macosx { +declare 143 { void XSetICFocus(XIC xic) } -declare 144 macosx { - void XDestroyIC(XIC xic) -} -declare 145 macosx { - Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, - XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) -} -declare 146 macosx { - Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, - unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, - XColor _Xconst *x2) -} -declare 147 macosx { +declare 147 { void XFreeFontSet(Display *display, XFontSet fontset) } -declare 148 macosx { +declare 148 { int XCloseIM(XIM im) } -declare 149 macosx { +declare 149 { Bool XRegisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd, char *res_name, char *res_class, XIDProc callback, XPointer client_data) } -declare 150 macosx { +declare 150 { Bool XUnregisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd, char *res_name, char *res_class, XIDProc callback, XPointer client_data) } -declare 151 macosx { +declare 151 { char *XSetLocaleModifiers(const char *modifier_list) } -declare 152 macosx { +declare 152 { XIM XOpenIM(Display *dpy, struct _XrmHashBucketRec *rdb, char *res_name, char *res_class) } -declare 153 macosx { +declare 153 { char *XGetIMValues(XIM im, ...) } -declare 154 macosx { +declare 154 { char *XSetIMValues(XIM im, ...) } -declare 155 macosx { +declare 155 { XFontSet XCreateFontSet(Display *display, _Xconst char *base_font_name_list, char ***missing_charset_list, int *missing_charset_count, char **def_string) } -declare 156 macosx { +declare 156 { void XFreeStringList(char **list) } -declare 157 macosx { +declare 157 { KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i) } -declare 158 macosx { +declare 158 { Display *XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason) } diff --git a/generic/tkInt.h b/generic/tkInt.h index ebfa348..9f5a31b 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -549,17 +549,6 @@ typedef struct TkDisplay { * The following field were all added for Tk8.3 */ -#if TCL_MAJOR_VERSION < 9 -#if !defined(TK_NO_DEPRECATED) - int mouseButtonState; /* Current mouse button state for this - * display. NOT USED as of 8.6.10 */ - Window mouseButtonWindow; /* Window the button state was set in, added - * in Tk 8.4. */ -#else - int notused1; - XID notused2; -#endif /* !TK_NO_DEPRECATED */ -#endif Tk_Window warpWindow; Tk_Window warpMainwin; /* For finding the root window for warping * purposes. */ diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 84f360d..b6c2543 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -202,9 +202,7 @@ EXTERN void TkpClaimFocus(TkWindow *topLevelPtr, int force); EXTERN void TkpDisplayWarning(const char *msg, const char *title); /* 59 */ EXTERN void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name); -/* 60 */ -TK_DEPRECATED("renamed to Tk_GetOtherWindow") -TkWindow * TkpGetOtherWindow(TkWindow *winPtr); +/* Slot 60 is reserved */ /* 61 */ EXTERN TkWindow * TkpGetWrapperWindow(TkWindow *winPtr); /* 62 */ @@ -212,14 +210,10 @@ EXTERN int TkpInit(Tcl_Interp *interp); /* 63 */ EXTERN void TkpInitializeMenuBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable); -/* 64 */ -TK_DEPRECATED("renamed to Tk_MakeContainer") -void TkpMakeContainer(Tk_Window tkwin); +/* Slot 64 is reserved */ /* 65 */ EXTERN void TkpMakeMenuWindow(Tk_Window tkwin, int transient); -/* 66 */ -TK_DEPRECATED("renamed to Tk_MakeWindow") -Window TkpMakeWindow(TkWindow *winPtr, Window parent); +/* Slot 66 is reserved */ /* 67 */ EXTERN void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, const char *menuName); @@ -238,14 +232,8 @@ EXTERN int TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr); /* 73 */ EXTERN void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr); -/* 74 */ -TK_DEPRECATED("renamed to Tk_SetMainMenubar") -void TkpSetMainMenubar(Tcl_Interp *interp, - Tk_Window tkwin, const char *menuName); -/* 75 */ -TK_DEPRECATED("renamed to Tk_UseWindow") -int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, - const char *string); +/* Slot 74 is reserved */ +/* Slot 75 is reserved */ /* Slot 76 is reserved */ /* 77 */ EXTERN void TkQueueEventForAllChildren(TkWindow *winPtr, @@ -270,11 +258,7 @@ EXTERN void TkSelInit(Tk_Window tkwin); /* 83 */ EXTERN void TkSelPropProc(XEvent *eventPtr); /* Slot 84 is reserved */ -/* 85 */ -TK_DEPRECATED("renamed to Tk_SetWindowMenubar") -void TkSetWindowMenuBar(Tcl_Interp *interp, - Tk_Window tkwin, const char *oldMenuName, - const char *menuName); +/* Slot 85 is reserved */ /* 86 */ EXTERN KeySym TkStringToKeysym(const char *name); /* 87 */ @@ -335,10 +319,7 @@ EXTERN const char * TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 110 */ EXTERN void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont); -/* 111 */ -TK_DEPRECATED("renamed to Tk_GetSystemDefault") -Tcl_Obj * TkpGetSystemDefault(Tk_Window tkwin, - const char *dbName, const char *className); +/* Slot 111 is reserved */ /* 112 */ EXTERN void TkpMenuThreadInit(void); /* 113 */ @@ -384,11 +365,7 @@ EXTERN Pixmap TkpGetNativeAppBitmap(Display *display, /* Slot 132 is reserved */ /* Slot 133 is reserved */ /* Slot 134 is reserved */ -/* 135 */ -TK_DEPRECATED("renamed to Tk_DrawHighlightBorder") -void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, - GC bgGC, int highlightWidth, - Drawable drawable); +/* Slot 135 is reserved */ /* 136 */ EXTERN void TkSetFocusWin(TkWindow *winPtr, int force); /* 137 */ @@ -637,13 +614,13 @@ typedef struct TkIntStubs { void (*tkpClaimFocus) (TkWindow *topLevelPtr, int force); /* 57 */ void (*tkpDisplayWarning) (const char *msg, const char *title); /* 58 */ void (*tkpGetAppName) (Tcl_Interp *interp, Tcl_DString *name); /* 59 */ - TCL_DEPRECATED_API("renamed to Tk_GetOtherWindow") TkWindow * (*tkpGetOtherWindow) (TkWindow *winPtr); /* 60 */ + void (*reserved60)(void); TkWindow * (*tkpGetWrapperWindow) (TkWindow *winPtr); /* 61 */ int (*tkpInit) (Tcl_Interp *interp); /* 62 */ void (*tkpInitializeMenuBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable); /* 63 */ - TCL_DEPRECATED_API("renamed to Tk_MakeContainer") void (*tkpMakeContainer) (Tk_Window tkwin); /* 64 */ + void (*reserved64)(void); void (*tkpMakeMenuWindow) (Tk_Window tkwin, int transient); /* 65 */ - TCL_DEPRECATED_API("renamed to Tk_MakeWindow") Window (*tkpMakeWindow) (TkWindow *winPtr, Window parent); /* 66 */ + void (*reserved66)(void); void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp *interp, const char *menuName); /* 67 */ TkDisplay * (*tkpOpenDisplay) (const char *display_name); /* 68 */ int (*tkPointerEvent) (XEvent *eventPtr, TkWindow *winPtr); /* 69 */ @@ -651,8 +628,8 @@ typedef struct TkIntStubs { double (*tkPolygonToPoint) (double *polyPtr, int numPoints, double *pointPtr); /* 71 */ int (*tkPositionInTree) (TkWindow *winPtr, TkWindow *treePtr); /* 72 */ void (*tkpRedirectKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 73 */ - TCL_DEPRECATED_API("renamed to Tk_SetMainMenubar") void (*tkpSetMainMenubar) (Tcl_Interp *interp, Tk_Window tkwin, const char *menuName); /* 74 */ - TCL_DEPRECATED_API("renamed to Tk_UseWindow") int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, const char *string); /* 75 */ + void (*reserved74)(void); + void (*reserved75)(void); void (*reserved76)(void); void (*tkQueueEventForAllChildren) (TkWindow *winPtr, XEvent *eventPtr); /* 77 */ int (*tkReadBitmapFile) (Display *display, Drawable d, const char *filename, unsigned int *width_return, unsigned int *height_return, Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return); /* 78 */ @@ -662,7 +639,7 @@ typedef struct TkIntStubs { void (*tkSelInit) (Tk_Window tkwin); /* 82 */ void (*tkSelPropProc) (XEvent *eventPtr); /* 83 */ void (*reserved84)(void); - TCL_DEPRECATED_API("renamed to Tk_SetWindowMenubar") void (*tkSetWindowMenuBar) (Tcl_Interp *interp, Tk_Window tkwin, const char *oldMenuName, const char *menuName); /* 85 */ + void (*reserved85)(void); KeySym (*tkStringToKeysym) (const char *name); /* 86 */ int (*tkThickPolyLineToArea) (double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr); /* 87 */ void (*tkWmAddToColormapWindows) (TkWindow *winPtr); /* 88 */ @@ -688,7 +665,7 @@ typedef struct TkIntStubs { int (*tkGetWindowFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr); /* 108 */ const char * (*tkpGetString) (TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 109 */ void (*tkpGetSubFonts) (Tcl_Interp *interp, Tk_Font tkfont); /* 110 */ - TCL_DEPRECATED_API("renamed to Tk_GetSystemDefault") Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 111 */ + void (*reserved111)(void); void (*tkpMenuThreadInit) (void); /* 112 */ int (*xClipBox) (Region rgn, XRectangle *rect_return); /* 113 */ Region (*xCreateRegion) (void); /* 114 */ @@ -739,7 +716,7 @@ typedef struct TkIntStubs { void (*reserved132)(void); void (*reserved133)(void); void (*reserved134)(void); - TCL_DEPRECATED_API("renamed to Tk_DrawHighlightBorder") void (*tkpDrawHighlightBorder) (Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable); /* 135 */ + void (*reserved135)(void); void (*tkSetFocusWin) (TkWindow *winPtr, int force); /* 136 */ void (*tkpSetKeycodeAndState) (Tk_Window tkwin, KeySym keySym, XEvent *eventPtr); /* 137 */ KeySym (*tkpGetKeySym) (TkDisplay *dispPtr, XEvent *eventPtr); /* 138 */ @@ -923,20 +900,17 @@ extern const TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkpDisplayWarning) /* 58 */ #define TkpGetAppName \ (tkIntStubsPtr->tkpGetAppName) /* 59 */ -#define TkpGetOtherWindow \ - (tkIntStubsPtr->tkpGetOtherWindow) /* 60 */ +/* Slot 60 is reserved */ #define TkpGetWrapperWindow \ (tkIntStubsPtr->tkpGetWrapperWindow) /* 61 */ #define TkpInit \ (tkIntStubsPtr->tkpInit) /* 62 */ #define TkpInitializeMenuBindings \ (tkIntStubsPtr->tkpInitializeMenuBindings) /* 63 */ -#define TkpMakeContainer \ - (tkIntStubsPtr->tkpMakeContainer) /* 64 */ +/* Slot 64 is reserved */ #define TkpMakeMenuWindow \ (tkIntStubsPtr->tkpMakeMenuWindow) /* 65 */ -#define TkpMakeWindow \ - (tkIntStubsPtr->tkpMakeWindow) /* 66 */ +/* Slot 66 is reserved */ #define TkpMenuNotifyToplevelCreate \ (tkIntStubsPtr->tkpMenuNotifyToplevelCreate) /* 67 */ #define TkpOpenDisplay \ @@ -951,10 +925,8 @@ extern const TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkPositionInTree) /* 72 */ #define TkpRedirectKeyEvent \ (tkIntStubsPtr->tkpRedirectKeyEvent) /* 73 */ -#define TkpSetMainMenubar \ - (tkIntStubsPtr->tkpSetMainMenubar) /* 74 */ -#define TkpUseWindow \ - (tkIntStubsPtr->tkpUseWindow) /* 75 */ +/* Slot 74 is reserved */ +/* Slot 75 is reserved */ /* Slot 76 is reserved */ #define TkQueueEventForAllChildren \ (tkIntStubsPtr->tkQueueEventForAllChildren) /* 77 */ @@ -971,8 +943,7 @@ extern const TkIntStubs *tkIntStubsPtr; #define TkSelPropProc \ (tkIntStubsPtr->tkSelPropProc) /* 83 */ /* Slot 84 is reserved */ -#define TkSetWindowMenuBar \ - (tkIntStubsPtr->tkSetWindowMenuBar) /* 85 */ +/* Slot 85 is reserved */ #define TkStringToKeysym \ (tkIntStubsPtr->tkStringToKeysym) /* 86 */ #define TkThickPolyLineToArea \ @@ -1023,8 +994,7 @@ extern const TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkpGetString) /* 109 */ #define TkpGetSubFonts \ (tkIntStubsPtr->tkpGetSubFonts) /* 110 */ -#define TkpGetSystemDefault \ - (tkIntStubsPtr->tkpGetSystemDefault) /* 111 */ +/* Slot 111 is reserved */ #define TkpMenuThreadInit \ (tkIntStubsPtr->tkpMenuThreadInit) /* 112 */ #define XClipBox \ @@ -1065,8 +1035,7 @@ extern const TkIntStubs *tkIntStubsPtr; /* Slot 132 is reserved */ /* Slot 133 is reserved */ /* Slot 134 is reserved */ -#define TkpDrawHighlightBorder \ - (tkIntStubsPtr->tkpDrawHighlightBorder) /* 135 */ +/* Slot 135 is reserved */ #define TkSetFocusWin \ (tkIntStubsPtr->tkSetFocusWin) /* 136 */ #define TkpSetKeycodeAndState \ @@ -1178,17 +1147,6 @@ extern const TkIntStubs *tkIntStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT -#if !defined(TK_NO_DEPRECATED) -# define TkSetWindowMenuBar Tk_SetWindowMenubar -# define TkpDrawHighlightBorder Tk_DrawHighlightBorder -# define TkpUseWindow Tk_UseWindow -# define TkpSetMainMenubar Tk_SetMainMenubar -# define TkpGetOtherWindow ((TkWindow *(*)(TkWindow *))(void *)Tk_GetOtherWindow) -# define TkpGetSystemDefault Tk_GetSystemDefault -# define TkpMakeContainer Tk_MakeContainer -# define TkpMakeWindow ((Window (*)(TkWindow *, Window))(void *)Tk_MakeWindow) -#endif - #if !defined(MAC_OSX_TK) && !defined(USE_TK_STUBS) # undef TkpWillDrawWidget # undef TkpRedrawWidget diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 48948a0..aedad62 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -145,12 +145,10 @@ EXTERN int TkpTestsendCmd(void *clientData, Tcl_Interp *interp, EXTERN Tk_Window TkpGetCapture(void); #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ -/* 0 */ -EXTERN void TkGenerateActivateEvents(TkWindow *winPtr, - int active); +/* Slot 0 is reserved */ /* Slot 1 is reserved */ /* 2 */ -EXTERN void TkGenerateActivateEvents_(TkWindow *winPtr, +EXTERN void TkGenerateActivateEvents(TkWindow *winPtr, int active); /* 3 */ EXTERN void TkPointerDeadWindow(TkWindow *winPtr); @@ -187,9 +185,7 @@ EXTERN void TkMacOSXHandleMenuSelect(short theMenu, /* 21 */ EXTERN void TkMacOSXInvalidateWindow(MacDrawable *macWin, int flag); -/* 22 */ -EXTERN int TkMacOSXIsCharacterMissing(Tk_Font tkfont, - unsigned int searchChar); +/* Slot 22 is reserved */ /* 23 */ EXTERN void TkMacOSXMakeRealWindowExist(TkWindow *winPtr); /* 24 */ @@ -203,8 +199,7 @@ EXTERN int TkMacOSXResizable(TkWindow *winPtr); EXTERN void TkMacOSXSetHelpMenuItemCount(void); /* 29 */ EXTERN void TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag); -/* 30 */ -EXTERN void TkMacOSXSetUpClippingRgn(Drawable drawable); +/* Slot 30 is reserved */ /* 31 */ EXTERN void TkMacOSXSetUpGraphicsPort(GC gc, void *destPort); /* 32 */ @@ -265,29 +260,21 @@ EXTERN void TkCreateXEventSource(void); /* 2 */ EXTERN void TkGenerateActivateEvents(TkWindow *winPtr, int active); -/* 3 */ -EXTERN int TkpCmapStressed(Tk_Window tkwin, Colormap colormap); -/* 4 */ -EXTERN void TkpSync(Display *display); -/* 5 */ -EXTERN Window TkUnixContainerId(TkWindow *winPtr); -/* 6 */ -EXTERN int TkUnixDoOneXEvent(Tcl_Time *timePtr); -/* 7 */ -EXTERN void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar); +/* Slot 3 is reserved */ +/* Slot 4 is reserved */ +/* Slot 5 is reserved */ +/* Slot 6 is reserved */ +/* Slot 7 is reserved */ /* 8 */ EXTERN int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr); /* 9 */ EXTERN void TkWmCleanup(TkDisplay *dispPtr); -/* 10 */ -EXTERN void TkSendCleanup(TkDisplay *dispPtr); +/* Slot 10 is reserved */ /* Slot 11 is reserved */ /* 12 */ EXTERN int TkpWmSetState(TkWindow *winPtr, int state); -/* 13 */ -EXTERN int TkpTestsendCmd_(void *clientData, Tcl_Interp *interp, - Tcl_Size objc, Tcl_Obj *const objv[]); +/* Slot 13 is reserved */ /* Slot 14 is reserved */ /* Slot 15 is reserved */ /* Slot 16 is reserved */ @@ -313,19 +300,19 @@ EXTERN int TkpTestsendCmd_(void *clientData, Tcl_Interp *interp, /* Slot 36 is reserved */ /* Slot 37 is reserved */ /* 38 */ -EXTERN int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap); +EXTERN int TkpCmapStressed(Tk_Window tkwin, Colormap colormap); /* 39 */ -EXTERN void TkpSync_(Display *display); +EXTERN void TkpSync(Display *display); /* 40 */ -EXTERN Window TkUnixContainerId_(TkWindow *winPtr); +EXTERN Window TkUnixContainerId(TkWindow *winPtr); /* 41 */ -EXTERN int TkUnixDoOneXEvent_(Tcl_Time *timePtr); +EXTERN int TkUnixDoOneXEvent(Tcl_Time *timePtr); /* 42 */ -EXTERN void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar); +EXTERN void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar); /* 43 */ -EXTERN void TkWmCleanup_(TkDisplay *dispPtr); +EXTERN void TkWmCleanup(TkDisplay *dispPtr); /* 44 */ -EXTERN void TkSendCleanup_(TkDisplay *dispPtr); +EXTERN void TkSendCleanup(TkDisplay *dispPtr); /* 45 */ EXTERN int TkpTestsendCmd(void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); @@ -386,9 +373,9 @@ typedef struct TkIntPlatStubs { Tk_Window (*tkpGetCapture) (void); /* 47 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ - void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */ + void (*reserved0)(void); void (*reserved1)(void); - void (*tkGenerateActivateEvents_) (TkWindow *winPtr, int active); /* 2 */ + void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */ void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */ void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */ void (*tkpSetCursor) (TkpCursor cursor); /* 5 */ @@ -408,7 +395,7 @@ typedef struct TkIntPlatStubs { void (*reserved19)(void); void (*reserved20)(void); void (*tkMacOSXInvalidateWindow) (MacDrawable *macWin, int flag); /* 21 */ - int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */ + void (*reserved22)(void); void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */ void * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */ void (*tkMacOSXMenuClick) (void); /* 25 */ @@ -416,7 +403,7 @@ typedef struct TkIntPlatStubs { int (*tkMacOSXResizable) (TkWindow *winPtr); /* 27 */ void (*tkMacOSXSetHelpMenuItemCount) (void); /* 28 */ void (*tkMacOSXSetScrollbarGrow) (TkWindow *winPtr, int flag); /* 29 */ - void (*tkMacOSXSetUpClippingRgn) (Drawable drawable); /* 30 */ + void (*reserved30)(void); void (*tkMacOSXSetUpGraphicsPort) (GC gc, void *destPort); /* 31 */ void (*tkMacOSXUpdateClipRgn) (TkWindow *winPtr); /* 32 */ void (*reserved33)(void); @@ -447,17 +434,17 @@ typedef struct TkIntPlatStubs { void (*tkCreateXEventSource) (void); /* 0 */ void (*reserved1)(void); void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */ - int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 3 */ - void (*tkpSync) (Display *display); /* 4 */ - Window (*tkUnixContainerId) (TkWindow *winPtr); /* 5 */ - int (*tkUnixDoOneXEvent) (Tcl_Time *timePtr); /* 6 */ - void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 7 */ + void (*reserved3)(void); + void (*reserved4)(void); + void (*reserved5)(void); + void (*reserved6)(void); + void (*reserved7)(void); int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 8 */ void (*tkWmCleanup) (TkDisplay *dispPtr); /* 9 */ - void (*tkSendCleanup) (TkDisplay *dispPtr); /* 10 */ + void (*reserved10)(void); void (*reserved11)(void); int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */ - int (*tkpTestsendCmd_) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 13 */ + void (*reserved13)(void); void (*reserved14)(void); void (*reserved15)(void); void (*reserved16)(void); @@ -482,13 +469,13 @@ typedef struct TkIntPlatStubs { void (*reserved35)(void); void (*reserved36)(void); void (*reserved37)(void); - int (*tkpCmapStressed_) (Tk_Window tkwin, Colormap colormap); /* 38 */ - void (*tkpSync_) (Display *display); /* 39 */ - Window (*tkUnixContainerId_) (TkWindow *winPtr); /* 40 */ - int (*tkUnixDoOneXEvent_) (Tcl_Time *timePtr); /* 41 */ - void (*tkUnixSetMenubar_) (Tk_Window tkwin, Tk_Window menubar); /* 42 */ - void (*tkWmCleanup_) (TkDisplay *dispPtr); /* 43 */ - void (*tkSendCleanup_) (TkDisplay *dispPtr); /* 44 */ + int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 38 */ + void (*tkpSync) (Display *display); /* 39 */ + Window (*tkUnixContainerId) (TkWindow *winPtr); /* 40 */ + int (*tkUnixDoOneXEvent) (Tcl_Time *timePtr); /* 41 */ + void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 42 */ + void (*tkWmCleanup) (TkDisplay *dispPtr); /* 43 */ + void (*tkSendCleanup) (TkDisplay *dispPtr); /* 44 */ int (*tkpTestsendCmd) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 45 */ #endif /* X11 */ } TkIntPlatStubs; @@ -601,11 +588,10 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; (tkIntPlatStubsPtr->tkpGetCapture) /* 47 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ -#define TkGenerateActivateEvents \ - (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */ +/* Slot 0 is reserved */ /* Slot 1 is reserved */ -#define TkGenerateActivateEvents_ \ - (tkIntPlatStubsPtr->tkGenerateActivateEvents_) /* 2 */ +#define TkGenerateActivateEvents \ + (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */ #define TkPointerDeadWindow \ (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */ #define TkpSetCapture \ @@ -639,8 +625,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; /* Slot 20 is reserved */ #define TkMacOSXInvalidateWindow \ (tkIntPlatStubsPtr->tkMacOSXInvalidateWindow) /* 21 */ -#define TkMacOSXIsCharacterMissing \ - (tkIntPlatStubsPtr->tkMacOSXIsCharacterMissing) /* 22 */ +/* Slot 22 is reserved */ #define TkMacOSXMakeRealWindowExist \ (tkIntPlatStubsPtr->tkMacOSXMakeRealWindowExist) /* 23 */ #define TkMacOSXMakeStippleMap \ @@ -654,8 +639,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; (tkIntPlatStubsPtr->tkMacOSXSetHelpMenuItemCount) /* 28 */ #define TkMacOSXSetScrollbarGrow \ (tkIntPlatStubsPtr->tkMacOSXSetScrollbarGrow) /* 29 */ -#define TkMacOSXSetUpClippingRgn \ - (tkIntPlatStubsPtr->tkMacOSXSetUpClippingRgn) /* 30 */ +/* Slot 30 is reserved */ #define TkMacOSXSetUpGraphicsPort \ (tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */ #define TkMacOSXUpdateClipRgn \ @@ -710,27 +694,20 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; /* Slot 1 is reserved */ #define TkGenerateActivateEvents \ (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */ -#define TkpCmapStressed \ - (tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */ -#define TkpSync \ - (tkIntPlatStubsPtr->tkpSync) /* 4 */ -#define TkUnixContainerId \ - (tkIntPlatStubsPtr->tkUnixContainerId) /* 5 */ -#define TkUnixDoOneXEvent \ - (tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 6 */ -#define TkUnixSetMenubar \ - (tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */ +/* Slot 3 is reserved */ +/* Slot 4 is reserved */ +/* Slot 5 is reserved */ +/* Slot 6 is reserved */ +/* Slot 7 is reserved */ #define TkpScanWindowId \ (tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */ #define TkWmCleanup \ (tkIntPlatStubsPtr->tkWmCleanup) /* 9 */ -#define TkSendCleanup \ - (tkIntPlatStubsPtr->tkSendCleanup) /* 10 */ +/* Slot 10 is reserved */ /* Slot 11 is reserved */ #define TkpWmSetState \ (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ -#define TkpTestsendCmd_ \ - (tkIntPlatStubsPtr->tkpTestsendCmd_) /* 13 */ +/* Slot 13 is reserved */ /* Slot 14 is reserved */ /* Slot 15 is reserved */ /* Slot 16 is reserved */ @@ -755,20 +732,20 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; /* Slot 35 is reserved */ /* Slot 36 is reserved */ /* Slot 37 is reserved */ -#define TkpCmapStressed_ \ - (tkIntPlatStubsPtr->tkpCmapStressed_) /* 38 */ -#define TkpSync_ \ - (tkIntPlatStubsPtr->tkpSync_) /* 39 */ -#define TkUnixContainerId_ \ - (tkIntPlatStubsPtr->tkUnixContainerId_) /* 40 */ -#define TkUnixDoOneXEvent_ \ - (tkIntPlatStubsPtr->tkUnixDoOneXEvent_) /* 41 */ -#define TkUnixSetMenubar_ \ - (tkIntPlatStubsPtr->tkUnixSetMenubar_) /* 42 */ -#define TkWmCleanup_ \ - (tkIntPlatStubsPtr->tkWmCleanup_) /* 43 */ -#define TkSendCleanup_ \ - (tkIntPlatStubsPtr->tkSendCleanup_) /* 44 */ +#define TkpCmapStressed \ + (tkIntPlatStubsPtr->tkpCmapStressed) /* 38 */ +#define TkpSync \ + (tkIntPlatStubsPtr->tkpSync) /* 39 */ +#define TkUnixContainerId \ + (tkIntPlatStubsPtr->tkUnixContainerId) /* 40 */ +#define TkUnixDoOneXEvent \ + (tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 41 */ +#define TkUnixSetMenubar \ + (tkIntPlatStubsPtr->tkUnixSetMenubar) /* 42 */ +#define TkWmCleanup \ + (tkIntPlatStubsPtr->tkWmCleanup) /* 43 */ +#define TkSendCleanup \ + (tkIntPlatStubsPtr->tkSendCleanup) /* 44 */ #define TkpTestsendCmd \ (tkIntPlatStubsPtr->tkpTestsendCmd) /* 45 */ #endif /* X11 */ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 360594a..6c247ca 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -56,7 +56,6 @@ extern "C" { * Exported function declarations: */ -#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ /* 0 */ EXTERN int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); @@ -475,436 +474,11 @@ EXTERN KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, EXTERN Display * XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); -#endif /* WIN */ -#ifdef MAC_OSX_TCL /* MACOSX */ -/* 0 */ -EXTERN int XSetDashes(Display *display, GC gc, int dash_offset, - _Xconst char *dash_list, int n); -/* 1 */ -EXTERN XModifierKeymap * XGetModifierMapping(Display *d); -/* 2 */ -EXTERN XImage * XCreateImage(Display *d, Visual *v, unsigned int ui1, - int i1, int i2, char *cp, unsigned int ui2, - unsigned int ui3, int i3, int i4); -/* 3 */ -EXTERN XImage * XGetImage(Display *d, Drawable dr, int i1, int i2, - unsigned int ui1, unsigned int ui2, - unsigned long ul, int i3); -/* 4 */ -EXTERN char * XGetAtomName(Display *d, Atom a); -/* 5 */ -EXTERN char * XKeysymToString(KeySym k); -/* 6 */ -EXTERN Colormap XCreateColormap(Display *d, Window w, Visual *v, - int i); -/* 7 */ -EXTERN GContext XGContextFromGC(GC g); -/* 8 */ -EXTERN KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i); -/* 9 */ -EXTERN KeySym XStringToKeysym(_Xconst char *c); -/* 10 */ -EXTERN Window XRootWindow(Display *d, int i); -/* 11 */ -EXTERN XErrorHandler XSetErrorHandler(XErrorHandler x); -/* 12 */ -EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); -/* 13 */ -EXTERN int XBell(Display *d, int i); -/* 14 */ -EXTERN int XChangeProperty(Display *d, Window w, Atom a1, - Atom a2, int i1, int i2, - _Xconst unsigned char *c, int i3); -/* 15 */ -EXTERN int XChangeWindowAttributes(Display *d, Window w, - unsigned long ul, XSetWindowAttributes *x); -/* 16 */ -EXTERN int XConfigureWindow(Display *d, Window w, - unsigned int i, XWindowChanges *x); -/* 17 */ -EXTERN int XCopyArea(Display *d, Drawable dr1, Drawable dr2, - GC g, int i1, int i2, unsigned int ui1, - unsigned int ui2, int i3, int i4); -/* 18 */ -EXTERN int XCopyPlane(Display *d, Drawable dr1, Drawable dr2, - GC g, int i1, int i2, unsigned int ui1, - unsigned int ui2, int i3, int i4, - unsigned long ul); -/* 19 */ -EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d, - _Xconst char *data, unsigned int width, - unsigned int height); -/* 20 */ -EXTERN int XDefineCursor(Display *d, Window w, Cursor c); -/* 21 */ -EXTERN int XDestroyWindow(Display *d, Window w); -/* 22 */ -EXTERN int XDrawArc(Display *d, Drawable dr, GC g, int i1, - int i2, unsigned int ui1, unsigned int ui2, - int i3, int i4); -/* 23 */ -EXTERN int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, - int i1, int i2); -/* 24 */ -EXTERN int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, - int i2, unsigned int ui1, unsigned int ui2); -/* 25 */ -EXTERN int XFillArc(Display *d, Drawable dr, GC g, int i1, - int i2, unsigned int ui1, unsigned int ui2, - int i3, int i4); -/* 26 */ -EXTERN int XFillPolygon(Display *d, Drawable dr, GC g, - XPoint *x, int i1, int i2, int i3); -/* 27 */ -EXTERN int XFillRectangles(Display *d, Drawable dr, GC g, - XRectangle *x, int i); -/* 28 */ -EXTERN int XFreeColormap(Display *d, Colormap c); -/* 29 */ -EXTERN int XFreeColors(Display *d, Colormap c, - unsigned long *ulp, int i, unsigned long ul); -/* 30 */ -EXTERN int XFreeModifiermap(XModifierKeymap *x); -/* 31 */ -EXTERN Status XGetGeometry(Display *d, Drawable dr, Window *w, - int *i1, int *i2, unsigned int *ui1, - unsigned int *ui2, unsigned int *ui3, - unsigned int *ui4); -/* 32 */ -EXTERN int XGetWindowProperty(Display *d, Window w, Atom a1, - long l1, long l2, Bool b, Atom a2, Atom *ap, - int *ip, unsigned long *ulp1, - unsigned long *ulp2, unsigned char **cpp); -/* 33 */ -EXTERN int XGrabKeyboard(Display *d, Window w, Bool b, int i1, - int i2, Time t); -/* 34 */ -EXTERN int XGrabPointer(Display *d, Window w1, Bool b, - unsigned int ui, int i1, int i2, Window w2, - Cursor c, Time t); -/* 35 */ -EXTERN KeyCode XKeysymToKeycode(Display *d, KeySym k); -/* 36 */ -EXTERN int XMapWindow(Display *d, Window w); -/* 37 */ -EXTERN int XMoveResizeWindow(Display *d, Window w, int i1, - int i2, unsigned int ui1, unsigned int ui2); -/* 38 */ -EXTERN int XMoveWindow(Display *d, Window w, int i1, int i2); -/* 39 */ -EXTERN Bool XQueryPointer(Display *d, Window w1, Window *w2, - Window *w3, int *i1, int *i2, int *i3, - int *i4, unsigned int *ui); -/* 40 */ -EXTERN int XRaiseWindow(Display *d, Window w); -/* 41 */ -EXTERN int XRefreshKeyboardMapping(XMappingEvent *x); -/* 42 */ -EXTERN int XResizeWindow(Display *d, Window w, unsigned int ui1, - unsigned int ui2); -/* 43 */ -EXTERN int XSelectInput(Display *d, Window w, long l); -/* 44 */ -EXTERN Status XSendEvent(Display *d, Window w, Bool b, long l, - XEvent *x); -/* 45 */ -EXTERN int XSetIconName(Display *d, Window w, _Xconst char *c); -/* 46 */ -EXTERN int XSetInputFocus(Display *d, Window w, int i, Time t); -/* 47 */ -EXTERN int XSetSelectionOwner(Display *d, Atom a, Window w, - Time t); -/* 48 */ -EXTERN int XSetWindowBackground(Display *d, Window w, - unsigned long ul); -/* 49 */ -EXTERN int XSetWindowBackgroundPixmap(Display *d, Window w, - Pixmap p); -/* 50 */ -EXTERN int XSetWindowBorder(Display *d, Window w, - unsigned long ul); -/* 51 */ -EXTERN int XSetWindowBorderPixmap(Display *d, Window w, - Pixmap p); -/* 52 */ -EXTERN int XSetWindowBorderWidth(Display *d, Window w, - unsigned int ui); -/* 53 */ -EXTERN int XSetWindowColormap(Display *d, Window w, Colormap c); -/* 54 */ -EXTERN int XUngrabKeyboard(Display *d, Time t); -/* 55 */ -EXTERN int XUngrabPointer(Display *d, Time t); -/* 56 */ -EXTERN int XUnmapWindow(Display *d, Window w); -/* 57 */ -EXTERN int TkPutImage(unsigned long *colors, int ncolors, - Display *display, Drawable d, GC gc, - XImage *image, int src_x, int src_y, - int dest_x, int dest_y, unsigned int width, - unsigned int height); -/* 58 */ -EXTERN Status XParseColor(Display *display, Colormap map, - _Xconst char *spec, XColor *colorPtr); -/* 59 */ -EXTERN GC XCreateGC(Display *display, Drawable d, - unsigned long valuemask, XGCValues *values); -/* 60 */ -EXTERN int XFreeGC(Display *display, GC gc); -/* 61 */ -EXTERN Atom XInternAtom(Display *display, - _Xconst char *atom_name, Bool only_if_exists); -/* 62 */ -EXTERN int XSetBackground(Display *display, GC gc, - unsigned long foreground); -/* 63 */ -EXTERN int XSetForeground(Display *display, GC gc, - unsigned long foreground); -/* 64 */ -EXTERN int XSetClipMask(Display *display, GC gc, Pixmap pixmap); -/* 65 */ -EXTERN int XSetClipOrigin(Display *display, GC gc, - int clip_x_origin, int clip_y_origin); -/* 66 */ -EXTERN int XSetTSOrigin(Display *display, GC gc, - int ts_x_origin, int ts_y_origin); -/* 67 */ -EXTERN int XChangeGC(Display *d, GC gc, unsigned long mask, - XGCValues *values); -/* 68 */ -EXTERN int XSetFont(Display *display, GC gc, Font font); -/* 69 */ -EXTERN int XSetArcMode(Display *display, GC gc, int arc_mode); -/* 70 */ -EXTERN int XSetStipple(Display *display, GC gc, Pixmap stipple); -/* 71 */ -EXTERN int XSetFillRule(Display *display, GC gc, int fill_rule); -/* 72 */ -EXTERN int XSetFillStyle(Display *display, GC gc, - int fill_style); -/* 73 */ -EXTERN int XSetFunction(Display *display, GC gc, int function); -/* 74 */ -EXTERN int XSetLineAttributes(Display *display, GC gc, - unsigned int line_width, int line_style, - int cap_style, int join_style); -/* 75 */ -EXTERN int _XInitImageFuncPtrs(XImage *image); -/* 76 */ -EXTERN XIC XCreateIC(XIM xim, ...); -/* 77 */ -EXTERN XVisualInfo * XGetVisualInfo(Display *display, long vinfo_mask, - XVisualInfo *vinfo_template, - int *nitems_return); -/* 78 */ -EXTERN void XSetWMClientMachine(Display *display, Window w, - XTextProperty *text_prop); -/* 79 */ -EXTERN Status XStringListToTextProperty(char **list, int count, - XTextProperty *text_prop_return); -/* 80 */ -EXTERN int XDrawSegments(Display *display, Drawable d, GC gc, - XSegment *segments, int nsegments); -/* 81 */ -EXTERN int XForceScreenSaver(Display *display, int mode); -/* 82 */ -EXTERN int XDrawLine(Display *d, Drawable dr, GC g, int x1, - int y1, int x2, int y2); -/* 83 */ -EXTERN int XFillRectangle(Display *display, Drawable d, GC gc, - int x, int y, unsigned int width, - unsigned int height); -/* 84 */ -EXTERN int XClearWindow(Display *d, Window w); -/* 85 */ -EXTERN int XDrawPoint(Display *display, Drawable d, GC gc, - int x, int y); -/* 86 */ -EXTERN int XDrawPoints(Display *display, Drawable d, GC gc, - XPoint *points, int npoints, int mode); -/* 87 */ -EXTERN int XWarpPointer(Display *display, Window src_w, - Window dest_w, int src_x, int src_y, - unsigned int src_width, - unsigned int src_height, int dest_x, - int dest_y); -/* 88 */ -EXTERN int XQueryColor(Display *display, Colormap colormap, - XColor *def_in_out); -/* 89 */ -EXTERN int XQueryColors(Display *display, Colormap colormap, - XColor *defs_in_out, int ncolors); -/* 90 */ -EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, - Window *w3, Window **w4, unsigned int *ui); -/* 91 */ -EXTERN int XSync(Display *display, Bool discard); -/* 92 */ -EXTERN Bool XTranslateCoordinates(Display *d, Window w1, - Window w2, int i1, int i2, int *i3, int *i4, - Window *w3); -/* 93 */ -EXTERN int XDeleteProperty(Display *d, Window w, Atom a); -/* 94 */ -EXTERN int XFreeCursor(Display *d, Cursor c); -/* 95 */ -EXTERN int XGetInputFocus(Display *d, Window *w, int *i); -/* 96 */ -EXTERN int XmbLookupString(XIC xi, XKeyPressedEvent *xk, - char *c, int i, KeySym *k, Status *s); -/* 97 */ -EXTERN int XNextEvent(Display *d, XEvent *x); -/* 98 */ -EXTERN int XPutBackEvent(Display *d, XEvent *x); -/* 99 */ -EXTERN int XSetCommand(Display *d, Window w, char **c, int i); -/* 100 */ -EXTERN int XWindowEvent(Display *d, Window w, long l, XEvent *x); -/* 101 */ -EXTERN Status XGetWindowAttributes(Display *d, Window w, - XWindowAttributes *x); -/* 102 */ -EXTERN Status XGetWMColormapWindows(Display *d, Window w, - Window **wpp, int *ip); -/* 103 */ -EXTERN Status XIconifyWindow(Display *d, Window w, int i); -/* 104 */ -EXTERN Status XWithdrawWindow(Display *d, Window w, int i); -/* 105 */ -EXTERN XHostAddress * XListHosts(Display *d, int *i, Bool *b); -/* 106 */ -EXTERN int XSetClipRectangles(Display *display, GC gc, - int clip_x_origin, int clip_y_origin, - XRectangle rectangles[], int n, int ordering); -/* 107 */ -EXTERN int XFlush(Display *display); -/* 108 */ -EXTERN int XGrabServer(Display *display); -/* 109 */ -EXTERN int XUngrabServer(Display *display); -/* 110 */ -EXTERN int XFree(void *data); -/* 111 */ -EXTERN int XNoOp(Display *display); -/* 112 */ -EXTERN XAfterFunction XSynchronize(Display *display, Bool onoff); -/* 113 */ -EXTERN Status XLookupColor(Display *d, Colormap c1, - _Xconst char *c2, XColor *x1, XColor *x2); -/* 114 */ -EXTERN VisualID XVisualIDFromVisual(Visual *visual); -/* Slot 115 is reserved */ -/* Slot 116 is reserved */ -/* Slot 117 is reserved */ -/* Slot 118 is reserved */ -/* Slot 119 is reserved */ -/* 120 */ -EXTERN int XOffsetRegion(Region rgn, int dx, int dy); -/* 121 */ -EXTERN int XUnionRegion(Region srca, Region srcb, - Region dr_return); -/* 122 */ -EXTERN Window XCreateWindow(Display *display, Window parent, int x, - int y, unsigned int width, - unsigned int height, - unsigned int border_width, int depth, - unsigned int clazz, Visual *visual, - unsigned long value_mask, - XSetWindowAttributes *attributes); -/* Slot 123 is reserved */ -/* Slot 124 is reserved */ -/* Slot 125 is reserved */ -/* Slot 126 is reserved */ -/* Slot 127 is reserved */ -/* Slot 128 is reserved */ -/* 129 */ -EXTERN int XLowerWindow(Display *d, Window w); -/* 130 */ -EXTERN int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, - int n); -/* 131 */ -EXTERN int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, - int n); -/* 132 */ -EXTERN int XDrawRectangles(Display *d, Drawable dr, GC gc, - XRectangle *r, int n); -/* Slot 133 is reserved */ -/* Slot 134 is reserved */ -/* Slot 135 is reserved */ -/* 136 */ -EXTERN int XReparentWindow(Display *d, Window w, Window p, - int x, int y); -/* 137 */ -EXTERN int XPutImage(Display *d, Drawable dr, GC gc, XImage *im, - int sx, int sy, int dx, int dy, - unsigned int w, unsigned int h); -/* 138 */ -EXTERN Region XPolygonRegion(XPoint *pts, int n, int rule); -/* 139 */ -EXTERN int XPointInRegion(Region rgn, int x, int y); -/* 140 */ -EXTERN XVaNestedList XVaCreateNestedList(int dummy, ...); -/* 141 */ -EXTERN char * XSetICValues(XIC xic, ...); -/* 142 */ -EXTERN char * XGetICValues(XIC xic, ...); -/* 143 */ -EXTERN void XSetICFocus(XIC xic); -/* 144 */ -EXTERN void XDestroyIC(XIC xic); -/* 145 */ -EXTERN Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, - XColor *x1, XColor *x2, unsigned int ui1, - unsigned int ui2); -/* 146 */ -EXTERN Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, - unsigned int ui1, unsigned int ui2, - XColor _Xconst *x1, XColor _Xconst *x2); -/* 147 */ -EXTERN void XFreeFontSet(Display *display, XFontSet fontset); -/* 148 */ -EXTERN int XCloseIM(XIM im); -/* 149 */ -EXTERN Bool XRegisterIMInstantiateCallback(Display *dpy, - struct _XrmHashBucketRec *rbd, - char *res_name, char *res_class, - XIDProc callback, XPointer client_data); -/* 150 */ -EXTERN Bool XUnregisterIMInstantiateCallback(Display *dpy, - struct _XrmHashBucketRec *rbd, - char *res_name, char *res_class, - XIDProc callback, XPointer client_data); -/* 151 */ -EXTERN char * XSetLocaleModifiers(const char *modifier_list); -/* 152 */ -EXTERN XIM XOpenIM(Display *dpy, struct _XrmHashBucketRec *rdb, - char *res_name, char *res_class); -/* 153 */ -EXTERN char * XGetIMValues(XIM im, ...); -/* 154 */ -EXTERN char * XSetIMValues(XIM im, ...); -/* 155 */ -EXTERN XFontSet XCreateFontSet(Display *display, - _Xconst char *base_font_name_list, - char ***missing_charset_list, - int *missing_charset_count, - char **def_string); -/* 156 */ -EXTERN void XFreeStringList(char **list); -/* 157 */ -EXTERN KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, - int i); -/* 158 */ -EXTERN Display * XkbOpenDisplay(const char *name, int *ev_rtrn, - int *err_rtrn, int *major_rtrn, - int *minor_rtrn, int *reason); -#endif /* MACOSX */ typedef struct TkIntXlibStubs { int magic; void *hooks; -#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */ XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */ @@ -1064,168 +638,6 @@ typedef struct TkIntXlibStubs { void (*xFreeStringList) (char **list); /* 156 */ KeySym (*xkbKeycodeToKeysym) (Display *d, unsigned int k, int g, int i); /* 157 */ Display * (*xkbOpenDisplay) (const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); /* 158 */ -#endif /* WIN */ -#ifdef MAC_OSX_TCL /* MACOSX */ - int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ - XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */ - XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */ - XImage * (*xGetImage) (Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3); /* 3 */ - char * (*xGetAtomName) (Display *d, Atom a); /* 4 */ - char * (*xKeysymToString) (KeySym k); /* 5 */ - Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */ - GContext (*xGContextFromGC) (GC g); /* 7 */ - KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 8 */ - KeySym (*xStringToKeysym) (_Xconst char *c); /* 9 */ - Window (*xRootWindow) (Display *d, int i); /* 10 */ - XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */ - Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */ - int (*xBell) (Display *d, int i); /* 13 */ - int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */ - int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */ - int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */ - int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */ - int (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 18 */ - Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 19 */ - int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */ - int (*xDestroyWindow) (Display *d, Window w); /* 21 */ - int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */ - int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */ - int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */ - int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */ - int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */ - int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */ - int (*xFreeColormap) (Display *d, Colormap c); /* 28 */ - int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */ - int (*xFreeModifiermap) (XModifierKeymap *x); /* 30 */ - Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 31 */ - int (*xGetWindowProperty) (Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 32 */ - int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 33 */ - int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 34 */ - KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 35 */ - int (*xMapWindow) (Display *d, Window w); /* 36 */ - int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */ - int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */ - Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 39 */ - int (*xRaiseWindow) (Display *d, Window w); /* 40 */ - int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */ - int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */ - int (*xSelectInput) (Display *d, Window w, long l); /* 43 */ - Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */ - int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */ - int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */ - int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */ - int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */ - int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */ - int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */ - int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */ - int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */ - int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */ - int (*xUngrabKeyboard) (Display *d, Time t); /* 54 */ - int (*xUngrabPointer) (Display *d, Time t); /* 55 */ - int (*xUnmapWindow) (Display *d, Window w); /* 56 */ - int (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 57 */ - Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 58 */ - GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 59 */ - int (*xFreeGC) (Display *display, GC gc); /* 60 */ - Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 61 */ - int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 62 */ - int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 63 */ - int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 64 */ - int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 65 */ - int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 66 */ - int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 67 */ - int (*xSetFont) (Display *display, GC gc, Font font); /* 68 */ - int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 69 */ - int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 70 */ - int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 71 */ - int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 72 */ - int (*xSetFunction) (Display *display, GC gc, int function); /* 73 */ - int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */ - int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */ - XIC (*xCreateIC) (XIM xim, ...); /* 76 */ - XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */ - void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */ - Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */ - int (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */ - int (*xForceScreenSaver) (Display *display, int mode); /* 81 */ - int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */ - int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */ - int (*xClearWindow) (Display *d, Window w); /* 84 */ - int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */ - int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */ - int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */ - int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */ - int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */ - Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */ - int (*xSync) (Display *display, Bool discard); /* 91 */ - Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 92 */ - int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 93 */ - int (*xFreeCursor) (Display *d, Cursor c); /* 94 */ - int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 95 */ - int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 96 */ - int (*xNextEvent) (Display *d, XEvent *x); /* 97 */ - int (*xPutBackEvent) (Display *d, XEvent *x); /* 98 */ - int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 99 */ - int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 100 */ - Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 101 */ - Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 102 */ - Status (*xIconifyWindow) (Display *d, Window w, int i); /* 103 */ - Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 104 */ - XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 105 */ - int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 106 */ - int (*xFlush) (Display *display); /* 107 */ - int (*xGrabServer) (Display *display); /* 108 */ - int (*xUngrabServer) (Display *display); /* 109 */ - int (*xFree) (void *data); /* 110 */ - int (*xNoOp) (Display *display); /* 111 */ - XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */ - Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 113 */ - VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */ - void (*reserved115)(void); - void (*reserved116)(void); - void (*reserved117)(void); - void (*reserved118)(void); - void (*reserved119)(void); - int (*xOffsetRegion) (Region rgn, int dx, int dy); /* 120 */ - int (*xUnionRegion) (Region srca, Region srcb, Region dr_return); /* 121 */ - Window (*xCreateWindow) (Display *display, Window parent, int x, int y, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int clazz, Visual *visual, unsigned long value_mask, XSetWindowAttributes *attributes); /* 122 */ - void (*reserved123)(void); - void (*reserved124)(void); - void (*reserved125)(void); - void (*reserved126)(void); - void (*reserved127)(void); - void (*reserved128)(void); - int (*xLowerWindow) (Display *d, Window w); /* 129 */ - int (*xFillArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 130 */ - int (*xDrawArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */ - int (*xDrawRectangles) (Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* 132 */ - void (*reserved133)(void); - void (*reserved134)(void); - void (*reserved135)(void); - int (*xReparentWindow) (Display *d, Window w, Window p, int x, int y); /* 136 */ - int (*xPutImage) (Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 137 */ - Region (*xPolygonRegion) (XPoint *pts, int n, int rule); /* 138 */ - int (*xPointInRegion) (Region rgn, int x, int y); /* 139 */ - XVaNestedList (*xVaCreateNestedList) (int dummy, ...); /* 140 */ - char * (*xSetICValues) (XIC xic, ...); /* 141 */ - char * (*xGetICValues) (XIC xic, ...); /* 142 */ - void (*xSetICFocus) (XIC xic); /* 143 */ - void (*xDestroyIC) (XIC xic); /* 144 */ - Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 145 */ - Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 146 */ - void (*xFreeFontSet) (Display *display, XFontSet fontset); /* 147 */ - int (*xCloseIM) (XIM im); /* 148 */ - Bool (*xRegisterIMInstantiateCallback) (Display *dpy, struct _XrmHashBucketRec *rbd, char *res_name, char *res_class, XIDProc callback, XPointer client_data); /* 149 */ - Bool (*xUnregisterIMInstantiateCallback) (Display *dpy, struct _XrmHashBucketRec *rbd, char *res_name, char *res_class, XIDProc callback, XPointer client_data); /* 150 */ - char * (*xSetLocaleModifiers) (const char *modifier_list); /* 151 */ - XIM (*xOpenIM) (Display *dpy, struct _XrmHashBucketRec *rdb, char *res_name, char *res_class); /* 152 */ - char * (*xGetIMValues) (XIM im, ...); /* 153 */ - char * (*xSetIMValues) (XIM im, ...); /* 154 */ - XFontSet (*xCreateFontSet) (Display *display, _Xconst char *base_font_name_list, char ***missing_charset_list, int *missing_charset_count, char **def_string); /* 155 */ - void (*xFreeStringList) (char **list); /* 156 */ - KeySym (*xkbKeycodeToKeysym) (Display *d, unsigned int k, int g, int i); /* 157 */ - Display * (*xkbOpenDisplay) (const char *name, int *ev_rtrn, int *err_rtrn, int *major_rtrn, int *minor_rtrn, int *reason); /* 158 */ -#endif /* MACOSX */ } TkIntXlibStubs; extern const TkIntXlibStubs *tkIntXlibStubsPtr; @@ -1240,7 +652,6 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; * Inline function declarations: */ -#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ #define XSetDashes \ (tkIntXlibStubsPtr->xSetDashes) /* 0 */ #define XGetModifierMapping \ @@ -1545,313 +956,6 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; (tkIntXlibStubsPtr->xkbKeycodeToKeysym) /* 157 */ #define XkbOpenDisplay \ (tkIntXlibStubsPtr->xkbOpenDisplay) /* 158 */ -#endif /* WIN */ -#ifdef MAC_OSX_TCL /* MACOSX */ -#define XSetDashes \ - (tkIntXlibStubsPtr->xSetDashes) /* 0 */ -#define XGetModifierMapping \ - (tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */ -#define XCreateImage \ - (tkIntXlibStubsPtr->xCreateImage) /* 2 */ -#define XGetImage \ - (tkIntXlibStubsPtr->xGetImage) /* 3 */ -#define XGetAtomName \ - (tkIntXlibStubsPtr->xGetAtomName) /* 4 */ -#define XKeysymToString \ - (tkIntXlibStubsPtr->xKeysymToString) /* 5 */ -#define XCreateColormap \ - (tkIntXlibStubsPtr->xCreateColormap) /* 6 */ -#define XGContextFromGC \ - (tkIntXlibStubsPtr->xGContextFromGC) /* 7 */ -#define XKeycodeToKeysym \ - (tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */ -#define XStringToKeysym \ - (tkIntXlibStubsPtr->xStringToKeysym) /* 9 */ -#define XRootWindow \ - (tkIntXlibStubsPtr->xRootWindow) /* 10 */ -#define XSetErrorHandler \ - (tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */ -#define XAllocColor \ - (tkIntXlibStubsPtr->xAllocColor) /* 12 */ -#define XBell \ - (tkIntXlibStubsPtr->xBell) /* 13 */ -#define XChangeProperty \ - (tkIntXlibStubsPtr->xChangeProperty) /* 14 */ -#define XChangeWindowAttributes \ - (tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */ -#define XConfigureWindow \ - (tkIntXlibStubsPtr->xConfigureWindow) /* 16 */ -#define XCopyArea \ - (tkIntXlibStubsPtr->xCopyArea) /* 17 */ -#define XCopyPlane \ - (tkIntXlibStubsPtr->xCopyPlane) /* 18 */ -#define XCreateBitmapFromData \ - (tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */ -#define XDefineCursor \ - (tkIntXlibStubsPtr->xDefineCursor) /* 20 */ -#define XDestroyWindow \ - (tkIntXlibStubsPtr->xDestroyWindow) /* 21 */ -#define XDrawArc \ - (tkIntXlibStubsPtr->xDrawArc) /* 22 */ -#define XDrawLines \ - (tkIntXlibStubsPtr->xDrawLines) /* 23 */ -#define XDrawRectangle \ - (tkIntXlibStubsPtr->xDrawRectangle) /* 24 */ -#define XFillArc \ - (tkIntXlibStubsPtr->xFillArc) /* 25 */ -#define XFillPolygon \ - (tkIntXlibStubsPtr->xFillPolygon) /* 26 */ -#define XFillRectangles \ - (tkIntXlibStubsPtr->xFillRectangles) /* 27 */ -#define XFreeColormap \ - (tkIntXlibStubsPtr->xFreeColormap) /* 28 */ -#define XFreeColors \ - (tkIntXlibStubsPtr->xFreeColors) /* 29 */ -#define XFreeModifiermap \ - (tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */ -#define XGetGeometry \ - (tkIntXlibStubsPtr->xGetGeometry) /* 31 */ -#define XGetWindowProperty \ - (tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */ -#define XGrabKeyboard \ - (tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */ -#define XGrabPointer \ - (tkIntXlibStubsPtr->xGrabPointer) /* 34 */ -#define XKeysymToKeycode \ - (tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */ -#define XMapWindow \ - (tkIntXlibStubsPtr->xMapWindow) /* 36 */ -#define XMoveResizeWindow \ - (tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */ -#define XMoveWindow \ - (tkIntXlibStubsPtr->xMoveWindow) /* 38 */ -#define XQueryPointer \ - (tkIntXlibStubsPtr->xQueryPointer) /* 39 */ -#define XRaiseWindow \ - (tkIntXlibStubsPtr->xRaiseWindow) /* 40 */ -#define XRefreshKeyboardMapping \ - (tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */ -#define XResizeWindow \ - (tkIntXlibStubsPtr->xResizeWindow) /* 42 */ -#define XSelectInput \ - (tkIntXlibStubsPtr->xSelectInput) /* 43 */ -#define XSendEvent \ - (tkIntXlibStubsPtr->xSendEvent) /* 44 */ -#define XSetIconName \ - (tkIntXlibStubsPtr->xSetIconName) /* 45 */ -#define XSetInputFocus \ - (tkIntXlibStubsPtr->xSetInputFocus) /* 46 */ -#define XSetSelectionOwner \ - (tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */ -#define XSetWindowBackground \ - (tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */ -#define XSetWindowBackgroundPixmap \ - (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */ -#define XSetWindowBorder \ - (tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */ -#define XSetWindowBorderPixmap \ - (tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */ -#define XSetWindowBorderWidth \ - (tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */ -#define XSetWindowColormap \ - (tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */ -#define XUngrabKeyboard \ - (tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */ -#define XUngrabPointer \ - (tkIntXlibStubsPtr->xUngrabPointer) /* 55 */ -#define XUnmapWindow \ - (tkIntXlibStubsPtr->xUnmapWindow) /* 56 */ -#define TkPutImage \ - (tkIntXlibStubsPtr->tkPutImage) /* 57 */ -#define XParseColor \ - (tkIntXlibStubsPtr->xParseColor) /* 58 */ -#define XCreateGC \ - (tkIntXlibStubsPtr->xCreateGC) /* 59 */ -#define XFreeGC \ - (tkIntXlibStubsPtr->xFreeGC) /* 60 */ -#define XInternAtom \ - (tkIntXlibStubsPtr->xInternAtom) /* 61 */ -#define XSetBackground \ - (tkIntXlibStubsPtr->xSetBackground) /* 62 */ -#define XSetForeground \ - (tkIntXlibStubsPtr->xSetForeground) /* 63 */ -#define XSetClipMask \ - (tkIntXlibStubsPtr->xSetClipMask) /* 64 */ -#define XSetClipOrigin \ - (tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */ -#define XSetTSOrigin \ - (tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */ -#define XChangeGC \ - (tkIntXlibStubsPtr->xChangeGC) /* 67 */ -#define XSetFont \ - (tkIntXlibStubsPtr->xSetFont) /* 68 */ -#define XSetArcMode \ - (tkIntXlibStubsPtr->xSetArcMode) /* 69 */ -#define XSetStipple \ - (tkIntXlibStubsPtr->xSetStipple) /* 70 */ -#define XSetFillRule \ - (tkIntXlibStubsPtr->xSetFillRule) /* 71 */ -#define XSetFillStyle \ - (tkIntXlibStubsPtr->xSetFillStyle) /* 72 */ -#define XSetFunction \ - (tkIntXlibStubsPtr->xSetFunction) /* 73 */ -#define XSetLineAttributes \ - (tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */ -#define _XInitImageFuncPtrs \ - (tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */ -#define XCreateIC \ - (tkIntXlibStubsPtr->xCreateIC) /* 76 */ -#define XGetVisualInfo \ - (tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */ -#define XSetWMClientMachine \ - (tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */ -#define XStringListToTextProperty \ - (tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */ -#define XDrawSegments \ - (tkIntXlibStubsPtr->xDrawSegments) /* 80 */ -#define XForceScreenSaver \ - (tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */ -#define XDrawLine \ - (tkIntXlibStubsPtr->xDrawLine) /* 82 */ -#define XFillRectangle \ - (tkIntXlibStubsPtr->xFillRectangle) /* 83 */ -#define XClearWindow \ - (tkIntXlibStubsPtr->xClearWindow) /* 84 */ -#define XDrawPoint \ - (tkIntXlibStubsPtr->xDrawPoint) /* 85 */ -#define XDrawPoints \ - (tkIntXlibStubsPtr->xDrawPoints) /* 86 */ -#define XWarpPointer \ - (tkIntXlibStubsPtr->xWarpPointer) /* 87 */ -#define XQueryColor \ - (tkIntXlibStubsPtr->xQueryColor) /* 88 */ -#define XQueryColors \ - (tkIntXlibStubsPtr->xQueryColors) /* 89 */ -#define XQueryTree \ - (tkIntXlibStubsPtr->xQueryTree) /* 90 */ -#define XSync \ - (tkIntXlibStubsPtr->xSync) /* 91 */ -#define XTranslateCoordinates \ - (tkIntXlibStubsPtr->xTranslateCoordinates) /* 92 */ -#define XDeleteProperty \ - (tkIntXlibStubsPtr->xDeleteProperty) /* 93 */ -#define XFreeCursor \ - (tkIntXlibStubsPtr->xFreeCursor) /* 94 */ -#define XGetInputFocus \ - (tkIntXlibStubsPtr->xGetInputFocus) /* 95 */ -#define XmbLookupString \ - (tkIntXlibStubsPtr->xmbLookupString) /* 96 */ -#define XNextEvent \ - (tkIntXlibStubsPtr->xNextEvent) /* 97 */ -#define XPutBackEvent \ - (tkIntXlibStubsPtr->xPutBackEvent) /* 98 */ -#define XSetCommand \ - (tkIntXlibStubsPtr->xSetCommand) /* 99 */ -#define XWindowEvent \ - (tkIntXlibStubsPtr->xWindowEvent) /* 100 */ -#define XGetWindowAttributes \ - (tkIntXlibStubsPtr->xGetWindowAttributes) /* 101 */ -#define XGetWMColormapWindows \ - (tkIntXlibStubsPtr->xGetWMColormapWindows) /* 102 */ -#define XIconifyWindow \ - (tkIntXlibStubsPtr->xIconifyWindow) /* 103 */ -#define XWithdrawWindow \ - (tkIntXlibStubsPtr->xWithdrawWindow) /* 104 */ -#define XListHosts \ - (tkIntXlibStubsPtr->xListHosts) /* 105 */ -#define XSetClipRectangles \ - (tkIntXlibStubsPtr->xSetClipRectangles) /* 106 */ -#define XFlush \ - (tkIntXlibStubsPtr->xFlush) /* 107 */ -#define XGrabServer \ - (tkIntXlibStubsPtr->xGrabServer) /* 108 */ -#define XUngrabServer \ - (tkIntXlibStubsPtr->xUngrabServer) /* 109 */ -#define XFree \ - (tkIntXlibStubsPtr->xFree) /* 110 */ -#define XNoOp \ - (tkIntXlibStubsPtr->xNoOp) /* 111 */ -#define XSynchronize \ - (tkIntXlibStubsPtr->xSynchronize) /* 112 */ -#define XLookupColor \ - (tkIntXlibStubsPtr->xLookupColor) /* 113 */ -#define XVisualIDFromVisual \ - (tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */ -/* Slot 115 is reserved */ -/* Slot 116 is reserved */ -/* Slot 117 is reserved */ -/* Slot 118 is reserved */ -/* Slot 119 is reserved */ -#define XOffsetRegion \ - (tkIntXlibStubsPtr->xOffsetRegion) /* 120 */ -#define XUnionRegion \ - (tkIntXlibStubsPtr->xUnionRegion) /* 121 */ -#define XCreateWindow \ - (tkIntXlibStubsPtr->xCreateWindow) /* 122 */ -/* Slot 123 is reserved */ -/* Slot 124 is reserved */ -/* Slot 125 is reserved */ -/* Slot 126 is reserved */ -/* Slot 127 is reserved */ -/* Slot 128 is reserved */ -#define XLowerWindow \ - (tkIntXlibStubsPtr->xLowerWindow) /* 129 */ -#define XFillArcs \ - (tkIntXlibStubsPtr->xFillArcs) /* 130 */ -#define XDrawArcs \ - (tkIntXlibStubsPtr->xDrawArcs) /* 131 */ -#define XDrawRectangles \ - (tkIntXlibStubsPtr->xDrawRectangles) /* 132 */ -/* Slot 133 is reserved */ -/* Slot 134 is reserved */ -/* Slot 135 is reserved */ -#define XReparentWindow \ - (tkIntXlibStubsPtr->xReparentWindow) /* 136 */ -#define XPutImage \ - (tkIntXlibStubsPtr->xPutImage) /* 137 */ -#define XPolygonRegion \ - (tkIntXlibStubsPtr->xPolygonRegion) /* 138 */ -#define XPointInRegion \ - (tkIntXlibStubsPtr->xPointInRegion) /* 139 */ -#define XVaCreateNestedList \ - (tkIntXlibStubsPtr->xVaCreateNestedList) /* 140 */ -#define XSetICValues \ - (tkIntXlibStubsPtr->xSetICValues) /* 141 */ -#define XGetICValues \ - (tkIntXlibStubsPtr->xGetICValues) /* 142 */ -#define XSetICFocus \ - (tkIntXlibStubsPtr->xSetICFocus) /* 143 */ -#define XDestroyIC \ - (tkIntXlibStubsPtr->xDestroyIC) /* 144 */ -#define XCreatePixmapCursor \ - (tkIntXlibStubsPtr->xCreatePixmapCursor) /* 145 */ -#define XCreateGlyphCursor \ - (tkIntXlibStubsPtr->xCreateGlyphCursor) /* 146 */ -#define XFreeFontSet \ - (tkIntXlibStubsPtr->xFreeFontSet) /* 147 */ -#define XCloseIM \ - (tkIntXlibStubsPtr->xCloseIM) /* 148 */ -#define XRegisterIMInstantiateCallback \ - (tkIntXlibStubsPtr->xRegisterIMInstantiateCallback) /* 149 */ -#define XUnregisterIMInstantiateCallback \ - (tkIntXlibStubsPtr->xUnregisterIMInstantiateCallback) /* 150 */ -#define XSetLocaleModifiers \ - (tkIntXlibStubsPtr->xSetLocaleModifiers) /* 151 */ -#define XOpenIM \ - (tkIntXlibStubsPtr->xOpenIM) /* 152 */ -#define XGetIMValues \ - (tkIntXlibStubsPtr->xGetIMValues) /* 153 */ -#define XSetIMValues \ - (tkIntXlibStubsPtr->xSetIMValues) /* 154 */ -#define XCreateFontSet \ - (tkIntXlibStubsPtr->xCreateFontSet) /* 155 */ -#define XFreeStringList \ - (tkIntXlibStubsPtr->xFreeStringList) /* 156 */ -#define XkbKeycodeToKeysym \ - (tkIntXlibStubsPtr->xkbKeycodeToKeysym) /* 157 */ -#define XkbOpenDisplay \ - (tkIntXlibStubsPtr->xkbOpenDisplay) /* 158 */ -#endif /* MACOSX */ #endif /* defined(USE_TK_STUBS) */ diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c index 5050f8a..2c32a18 100644 --- a/generic/tkPkgConfig.c +++ b/generic/tkPkgConfig.c @@ -95,14 +95,6 @@ #endif static const Tcl_Config cfg[] = { -#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 - {"debug", CFG_DEBUG}, - {"threaded", CFG_THREADED}, - {"profiled", CFG_PROFILED}, - {"64bit", CFG_64}, - {"optimized", CFG_OPTIMIZED}, - {"mem_debug", CFG_MEMDEBUG}, -#endif {"fontsystem", CFG_FONTSYSTEM}, /* Runtime paths to various stuff */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 1a6a481..ff2cc1c 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -41,40 +41,16 @@ MODULE_SCOPE const TkStubs tkStubs; #undef TkPutImage #undef XPutImage -#define TkMacOSXSetUpClippingRgn (void (*)(Drawable))(void *)doNothing -#undef TkMacOSXIsCharacterMissing -#define TkMacOSXIsCharacterMissing (int (*)(Tk_Font, unsigned int))(void *)doNothing -#if defined(TK_NO_DEPRECATED) || (TCL_MAJOR_VERSION > 8) -# define TkSetWindowMenuBar 0 -# define TkpDrawHighlightBorder 0 -# define TkpUseWindow 0 -# define TkpSetMainMenubar 0 -# define TkpGetOtherWindow 0 -# define TkpGetSystemDefault 0 -# define TkpMakeContainer 0 -# define TkpMakeWindow 0 -#endif +#define TkMacOSXDrawable Tk_MacOSXGetNSWindowForDrawable +#if !defined(MAC_OSX_TK) static int doNothing(void) { /* dummy implementation, no need to do anything */ return 0; } -#define TkpCmapStressed_ TkpCmapStressed -#define TkpSync_ TkpSync -#define TkUnixContainerId_ TkUnixContainerId -#define TkUnixDoOneXEvent_ TkUnixDoOneXEvent -#define TkUnixSetMenubar_ TkUnixSetMenubar -#define TkWmCleanup_ TkWmCleanup -#define TkSendCleanup_ TkSendCleanup -#define TkpTestsendCmd_ TkpTestsendCmd -#define TkGenWMConfigureEvent_ TkGenWMConfigureEvent -#define TkGenerateActivateEvents_ TkGenerateActivateEvents -#define TkMacOSXDrawable Tk_MacOSXGetNSWindowForDrawable - -#if !defined(MAC_OSX_TK) # undef TkpWillDrawWidget # undef TkpRedrawWidget # define TkpWillDrawWidget ((int (*)(Tk_Window))(void *)doNothing) @@ -316,13 +292,13 @@ static const TkIntStubs tkIntStubs = { TkpClaimFocus, /* 57 */ TkpDisplayWarning, /* 58 */ TkpGetAppName, /* 59 */ - TkpGetOtherWindow, /* 60 */ + 0, /* 60 */ TkpGetWrapperWindow, /* 61 */ TkpInit, /* 62 */ TkpInitializeMenuBindings, /* 63 */ - TkpMakeContainer, /* 64 */ + 0, /* 64 */ TkpMakeMenuWindow, /* 65 */ - TkpMakeWindow, /* 66 */ + 0, /* 66 */ TkpMenuNotifyToplevelCreate, /* 67 */ TkpOpenDisplay, /* 68 */ TkPointerEvent, /* 69 */ @@ -330,8 +306,8 @@ static const TkIntStubs tkIntStubs = { TkPolygonToPoint, /* 71 */ TkPositionInTree, /* 72 */ TkpRedirectKeyEvent, /* 73 */ - TkpSetMainMenubar, /* 74 */ - TkpUseWindow, /* 75 */ + 0, /* 74 */ + 0, /* 75 */ 0, /* 76 */ TkQueueEventForAllChildren, /* 77 */ TkReadBitmapFile, /* 78 */ @@ -341,7 +317,7 @@ static const TkIntStubs tkIntStubs = { TkSelInit, /* 82 */ TkSelPropProc, /* 83 */ 0, /* 84 */ - TkSetWindowMenuBar, /* 85 */ + 0, /* 85 */ TkStringToKeysym, /* 86 */ TkThickPolyLineToArea, /* 87 */ TkWmAddToColormapWindows, /* 88 */ @@ -367,7 +343,7 @@ static const TkIntStubs tkIntStubs = { TkGetWindowFromObj, /* 108 */ TkpGetString, /* 109 */ TkpGetSubFonts, /* 110 */ - TkpGetSystemDefault, /* 111 */ + 0, /* 111 */ TkpMenuThreadInit, /* 112 */ XClipBox, /* 113 */ XCreateRegion, /* 114 */ @@ -418,7 +394,7 @@ static const TkIntStubs tkIntStubs = { 0, /* 132 */ 0, /* 133 */ 0, /* 134 */ - TkpDrawHighlightBorder, /* 135 */ + 0, /* 135 */ TkSetFocusWin, /* 136 */ TkpSetKeycodeAndState, /* 137 */ TkpGetKeySym, /* 138 */ @@ -527,9 +503,9 @@ static const TkIntPlatStubs tkIntPlatStubs = { TkpGetCapture, /* 47 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ - TkGenerateActivateEvents, /* 0 */ + 0, /* 0 */ 0, /* 1 */ - TkGenerateActivateEvents_, /* 2 */ + TkGenerateActivateEvents, /* 2 */ TkPointerDeadWindow, /* 3 */ TkpSetCapture, /* 4 */ TkpSetCursor, /* 5 */ @@ -549,7 +525,7 @@ static const TkIntPlatStubs tkIntPlatStubs = { 0, /* 19 */ 0, /* 20 */ TkMacOSXInvalidateWindow, /* 21 */ - TkMacOSXIsCharacterMissing, /* 22 */ + 0, /* 22 */ TkMacOSXMakeRealWindowExist, /* 23 */ TkMacOSXMakeStippleMap, /* 24 */ TkMacOSXMenuClick, /* 25 */ @@ -557,7 +533,7 @@ static const TkIntPlatStubs tkIntPlatStubs = { TkMacOSXResizable, /* 27 */ TkMacOSXSetHelpMenuItemCount, /* 28 */ TkMacOSXSetScrollbarGrow, /* 29 */ - TkMacOSXSetUpClippingRgn, /* 30 */ + 0, /* 30 */ TkMacOSXSetUpGraphicsPort, /* 31 */ TkMacOSXUpdateClipRgn, /* 32 */ 0, /* 33 */ @@ -588,17 +564,17 @@ static const TkIntPlatStubs tkIntPlatStubs = { TkCreateXEventSource, /* 0 */ 0, /* 1 */ TkGenerateActivateEvents, /* 2 */ - TkpCmapStressed, /* 3 */ - TkpSync, /* 4 */ - TkUnixContainerId, /* 5 */ - TkUnixDoOneXEvent, /* 6 */ - TkUnixSetMenubar, /* 7 */ + 0, /* 3 */ + 0, /* 4 */ + 0, /* 5 */ + 0, /* 6 */ + 0, /* 7 */ TkpScanWindowId, /* 8 */ TkWmCleanup, /* 9 */ - TkSendCleanup, /* 10 */ + 0, /* 10 */ 0, /* 11 */ TkpWmSetState, /* 12 */ - TkpTestsendCmd_, /* 13 */ + 0, /* 13 */ 0, /* 14 */ 0, /* 15 */ 0, /* 16 */ @@ -623,13 +599,13 @@ static const TkIntPlatStubs tkIntPlatStubs = { 0, /* 35 */ 0, /* 36 */ 0, /* 37 */ - TkpCmapStressed_, /* 38 */ - TkpSync_, /* 39 */ - TkUnixContainerId_, /* 40 */ - TkUnixDoOneXEvent_, /* 41 */ - TkUnixSetMenubar_, /* 42 */ - TkWmCleanup_, /* 43 */ - TkSendCleanup_, /* 44 */ + TkpCmapStressed, /* 38 */ + TkpSync, /* 39 */ + TkUnixContainerId, /* 40 */ + TkUnixDoOneXEvent, /* 41 */ + TkUnixSetMenubar, /* 42 */ + TkWmCleanup, /* 43 */ + TkSendCleanup, /* 44 */ TkpTestsendCmd, /* 45 */ #endif /* X11 */ }; @@ -637,7 +613,6 @@ static const TkIntPlatStubs tkIntPlatStubs = { static const TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, 0, -#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ XSetDashes, /* 0 */ XGetModifierMapping, /* 1 */ XCreateImage, /* 2 */ @@ -797,168 +772,6 @@ static const TkIntXlibStubs tkIntXlibStubs = { XFreeStringList, /* 156 */ XkbKeycodeToKeysym, /* 157 */ XkbOpenDisplay, /* 158 */ -#endif /* WIN */ -#ifdef MAC_OSX_TCL /* MACOSX */ - XSetDashes, /* 0 */ - XGetModifierMapping, /* 1 */ - XCreateImage, /* 2 */ - XGetImage, /* 3 */ - XGetAtomName, /* 4 */ - XKeysymToString, /* 5 */ - XCreateColormap, /* 6 */ - XGContextFromGC, /* 7 */ - XKeycodeToKeysym, /* 8 */ - XStringToKeysym, /* 9 */ - XRootWindow, /* 10 */ - XSetErrorHandler, /* 11 */ - XAllocColor, /* 12 */ - XBell, /* 13 */ - XChangeProperty, /* 14 */ - XChangeWindowAttributes, /* 15 */ - XConfigureWindow, /* 16 */ - XCopyArea, /* 17 */ - XCopyPlane, /* 18 */ - XCreateBitmapFromData, /* 19 */ - XDefineCursor, /* 20 */ - XDestroyWindow, /* 21 */ - XDrawArc, /* 22 */ - XDrawLines, /* 23 */ - XDrawRectangle, /* 24 */ - XFillArc, /* 25 */ - XFillPolygon, /* 26 */ - XFillRectangles, /* 27 */ - XFreeColormap, /* 28 */ - XFreeColors, /* 29 */ - XFreeModifiermap, /* 30 */ - XGetGeometry, /* 31 */ - XGetWindowProperty, /* 32 */ - XGrabKeyboard, /* 33 */ - XGrabPointer, /* 34 */ - XKeysymToKeycode, /* 35 */ - XMapWindow, /* 36 */ - XMoveResizeWindow, /* 37 */ - XMoveWindow, /* 38 */ - XQueryPointer, /* 39 */ - XRaiseWindow, /* 40 */ - XRefreshKeyboardMapping, /* 41 */ - XResizeWindow, /* 42 */ - XSelectInput, /* 43 */ - XSendEvent, /* 44 */ - XSetIconName, /* 45 */ - XSetInputFocus, /* 46 */ - XSetSelectionOwner, /* 47 */ - XSetWindowBackground, /* 48 */ - XSetWindowBackgroundPixmap, /* 49 */ - XSetWindowBorder, /* 50 */ - XSetWindowBorderPixmap, /* 51 */ - XSetWindowBorderWidth, /* 52 */ - XSetWindowColormap, /* 53 */ - XUngrabKeyboard, /* 54 */ - XUngrabPointer, /* 55 */ - XUnmapWindow, /* 56 */ - TkPutImage, /* 57 */ - XParseColor, /* 58 */ - XCreateGC, /* 59 */ - XFreeGC, /* 60 */ - XInternAtom, /* 61 */ - XSetBackground, /* 62 */ - XSetForeground, /* 63 */ - XSetClipMask, /* 64 */ - XSetClipOrigin, /* 65 */ - XSetTSOrigin, /* 66 */ - XChangeGC, /* 67 */ - XSetFont, /* 68 */ - XSetArcMode, /* 69 */ - XSetStipple, /* 70 */ - XSetFillRule, /* 71 */ - XSetFillStyle, /* 72 */ - XSetFunction, /* 73 */ - XSetLineAttributes, /* 74 */ - _XInitImageFuncPtrs, /* 75 */ - XCreateIC, /* 76 */ - XGetVisualInfo, /* 77 */ - XSetWMClientMachine, /* 78 */ - XStringListToTextProperty, /* 79 */ - XDrawSegments, /* 80 */ - XForceScreenSaver, /* 81 */ - XDrawLine, /* 82 */ - XFillRectangle, /* 83 */ - XClearWindow, /* 84 */ - XDrawPoint, /* 85 */ - XDrawPoints, /* 86 */ - XWarpPointer, /* 87 */ - XQueryColor, /* 88 */ - XQueryColors, /* 89 */ - XQueryTree, /* 90 */ - XSync, /* 91 */ - XTranslateCoordinates, /* 92 */ - XDeleteProperty, /* 93 */ - XFreeCursor, /* 94 */ - XGetInputFocus, /* 95 */ - XmbLookupString, /* 96 */ - XNextEvent, /* 97 */ - XPutBackEvent, /* 98 */ - XSetCommand, /* 99 */ - XWindowEvent, /* 100 */ - XGetWindowAttributes, /* 101 */ - XGetWMColormapWindows, /* 102 */ - XIconifyWindow, /* 103 */ - XWithdrawWindow, /* 104 */ - XListHosts, /* 105 */ - XSetClipRectangles, /* 106 */ - XFlush, /* 107 */ - XGrabServer, /* 108 */ - XUngrabServer, /* 109 */ - XFree, /* 110 */ - XNoOp, /* 111 */ - XSynchronize, /* 112 */ - XLookupColor, /* 113 */ - XVisualIDFromVisual, /* 114 */ - 0, /* 115 */ - 0, /* 116 */ - 0, /* 117 */ - 0, /* 118 */ - 0, /* 119 */ - XOffsetRegion, /* 120 */ - XUnionRegion, /* 121 */ - XCreateWindow, /* 122 */ - 0, /* 123 */ - 0, /* 124 */ - 0, /* 125 */ - 0, /* 126 */ - 0, /* 127 */ - 0, /* 128 */ - XLowerWindow, /* 129 */ - XFillArcs, /* 130 */ - XDrawArcs, /* 131 */ - XDrawRectangles, /* 132 */ - 0, /* 133 */ - 0, /* 134 */ - 0, /* 135 */ - XReparentWindow, /* 136 */ - XPutImage, /* 137 */ - XPolygonRegion, /* 138 */ - XPointInRegion, /* 139 */ - XVaCreateNestedList, /* 140 */ - XSetICValues, /* 141 */ - XGetICValues, /* 142 */ - XSetICFocus, /* 143 */ - XDestroyIC, /* 144 */ - XCreatePixmapCursor, /* 145 */ - XCreateGlyphCursor, /* 146 */ - XFreeFontSet, /* 147 */ - XCloseIM, /* 148 */ - XRegisterIMInstantiateCallback, /* 149 */ - XUnregisterIMInstantiateCallback, /* 150 */ - XSetLocaleModifiers, /* 151 */ - XOpenIM, /* 152 */ - XGetIMValues, /* 153 */ - XSetIMValues, /* 154 */ - XCreateFontSet, /* 155 */ - XFreeStringList, /* 156 */ - XkbKeycodeToKeysym, /* 157 */ - XkbOpenDisplay, /* 158 */ -#endif /* MACOSX */ }; static const TkPlatStubs tkPlatStubs = { diff --git a/tests/embed.test b/tests/embed.test index 92b8be9..8a61baf 100644 --- a/tests/embed.test +++ b/tests/embed.test @@ -10,7 +10,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands -test embed-1.1 {TkpUseWindow procedure, bad window identifier} -setup { +test embed-1.1 {Tk_UseWindow procedure, bad window identifier} -setup { deleteWindows } -body { toplevel .t -use xyz @@ -36,7 +36,7 @@ test embed-1.3 {CreateFrame procedure, both -use and -container is invalid} -set } -returnCodes error -result {windows cannot have both the -use and the -container option set} # testing window embedding for win platforms -test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.4.win {Tk_UseWindow procedure, -container must be set} -constraints { win } -setup { deleteWindows @@ -47,7 +47,7 @@ test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints deleteWindows } -returnCodes error -result {the window to use is not a Tk container} # testing window embedding for win platforms -test embed-1.5.win {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.5.win {Tk_UseWindow procedure, -container must be set} -constraints { win } -setup { deleteWindows @@ -59,7 +59,7 @@ test embed-1.5.win {TkpUseWindow procedure, -container must be set} -constraints } -returnCodes error -result {the window to use is not a Tk container} # testing window embedding for other than win platforms -test embed-1.4.nonwin {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.4.nonwin {Tk_UseWindow procedure, -container must be set} -constraints { nonwin } -setup { deleteWindows @@ -70,7 +70,7 @@ test embed-1.4.nonwin {TkpUseWindow procedure, -container must be set} -constrai deleteWindows } -returnCodes error -result {window ".container" doesn't have -container option set} # testing window embedding for other than win platforms -test embed-1.5.nonwin {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.5.nonwin {Tk_UseWindow procedure, -container must be set} -constraints { nonwin } -setup { deleteWindows diff --git a/tests/menu.test b/tests/menu.test index c3fa4e3..6b667fe 100644 --- a/tests/menu.test +++ b/tests/menu.test @@ -3613,7 +3613,7 @@ test menu-24.3 {TkNewMenuName} -setup { } -result {0 {} {} {} {}} -test menu-25.1 {TkSetWindowMenuBar} -setup { +test menu-25.1 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3621,7 +3621,7 @@ test menu-25.1 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.2 {TkSetWindowMenuBar} -setup { +test menu-25.2 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3629,7 +3629,7 @@ test menu-25.2 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.3 {TkSetWindowMenuBar} -setup { +test menu-25.3 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3639,7 +3639,7 @@ test menu-25.3 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.4 {TkSetWindowMenuBar} -setup { +test menu-25.4 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3650,7 +3650,7 @@ test menu-25.4 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.5 {TkSetWindowMenuBar} -setup { +test menu-25.5 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3662,7 +3662,7 @@ test menu-25.5 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.6 {TkSetWindowMenuBar} -setup { +test menu-25.6 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3674,7 +3674,7 @@ test menu-25.6 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.7 {TkSetWindowMenuBar} -setup { +test menu-25.7 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3687,7 +3687,7 @@ test menu-25.7 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.8 {TkSetWindowMenuBar} -setup { +test menu-25.8 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3701,7 +3701,7 @@ test menu-25.8 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.9 {TkSetWindowMenuBar} -setup { +test menu-25.9 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3716,7 +3716,7 @@ test menu-25.9 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.10 {TkSetWindowMenuBar} -setup { +test menu-25.10 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3731,7 +3731,7 @@ test menu-25.10 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.11 {TkSetWindowMenuBar} -setup { +test menu-25.11 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3746,7 +3746,7 @@ test menu-25.11 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.12 {TkSetWindowMenuBar} -setup { +test menu-25.12 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3755,7 +3755,7 @@ test menu-25.12 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.13 {TkSetWindowMenuBar} -setup { +test menu-25.13 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3763,7 +3763,7 @@ test menu-25.13 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.14 {TkSetWindowMenuBar} -setup { +test menu-25.14 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3772,7 +3772,7 @@ test menu-25.14 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.15 {TkSetWindowMenuBar} -setup { +test menu-25.15 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" @@ -3780,7 +3780,7 @@ test menu-25.15 {TkSetWindowMenuBar} -setup { } -cleanup { deleteWindows } -result {{} {}} -test menu-25.16 {TkSetWindowMenuBar} -setup { +test menu-25.16 {Tk_SetWindowMenuBar} -setup { deleteWindows } -body { . configure -menu "" diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test index a66a310..066c30d 100644 --- a/tests/unixEmbed.test +++ b/tests/unixEmbed.test @@ -90,21 +90,21 @@ proc colorsFree {w {red 31} {green 245} {blue 192}} { testConstraint pressbutton [llength [info commands pressbutton]] -test unixEmbed-1.1 {TkpUseWindow procedure, bad window identifier} -constraints { +test unixEmbed-1.1 {Tk_UseWindow procedure, bad window identifier} -constraints { unix } -setup { deleteWindows } -body { toplevel .t -use xyz } -returnCodes error -result {expected integer but got "xyz"} -test unixEmbed-1.2 {TkpUseWindow procedure, bad window identifier} -constraints { +test unixEmbed-1.2 {Tk_UseWindow procedure, bad window identifier} -constraints { unix } -setup { deleteWindows } -body { toplevel .t -use 47 } -returnCodes error -result {couldn't create child of window "47"} -test unixEmbed-1.3 {TkpUseWindow procedure, inheriting colormap} -constraints { +test unixEmbed-1.3 {Tk_UseWindow procedure, inheriting colormap} -constraints { unix nonPortable } -setup { deleteWindows @@ -118,7 +118,7 @@ test unixEmbed-1.3 {TkpUseWindow procedure, inheriting colormap} -constraints { } -cleanup { deleteWindows } -result 0 -test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints { +test unixEmbed-1.4 {Tk_UseWindow procedure, inheriting colormap} -constraints { unix nonPortable } -setup { deleteWindows @@ -132,7 +132,7 @@ test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints { deleteWindows } -result 1 -test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} -constraints { +test unixEmbed-1.5 {Tk_UseWindow procedure, creating Container records} -constraints { unix testembed notAqua } -setup { deleteWindows @@ -149,7 +149,7 @@ test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} -constra } -cleanup { deleteWindows } -result {{{XXX {} {} .t}} 0} -test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constraints { +test unixEmbed-1.5a {Tk_UseWindow procedure, creating Container records} -constraints { unix testembed } -setup { deleteWindows @@ -170,7 +170,7 @@ test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constr interp delete child deleteWindows } -result {{{XXX {} {} .t}} 0} -test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constraints { +test unixEmbed-1.6 {Tk_UseWindow procedure, creating Container records} -constraints { unix testembed notAqua } -setup { deleteWindows @@ -189,7 +189,7 @@ test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constra } -cleanup { deleteWindows } -result {{XXX {} {} .t2} {XXX {} {} .t1}} -test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constraints { +test unixEmbed-1.6a {Tk_UseWindow procedure, creating Container records} -constraints { unix testembed } -setup { deleteWindows @@ -212,7 +212,7 @@ test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constr interp delete child deleteWindows } -result {{XXX {} {} .t2} {XXX {} {} .t1}} -test unixEmbed-1.7 {TkpUseWindow procedure, container and embedded in same app} -constraints { +test unixEmbed-1.7 {Tk_UseWindow procedure, container and embedded in same app} -constraints { unix testembed } -setup { deleteWindows diff --git a/xlib/X11/keysymdef.h b/xlib/X11/keysymdef.h index 8f1833f..0f031ba 100644 --- a/xlib/X11/keysymdef.h +++ b/xlib/X11/keysymdef.h @@ -182,15 +182,6 @@ SOFTWARE. #define XK_Begin 0xff58 /* BOL */ -#ifndef TK_NO_DEPRECATED -/* Special Windows keyboard keys */ - -#define XK_Win_L 0xFF5B /* Left-hand Windows */ -#define XK_Win_R 0xFF5C /* Right-hand Windows */ -#define XK_App 0xFF5D /* Menu key */ -#endif - - /* Misc functions */ #define XK_Select 0xff60 /* Select, mark */ @@ -1736,18 +1727,3 @@ SOFTWARE. #define XK_braille_dot_9 0xfff9 #define XK_braille_dot_10 0xfffa #endif /* XK_BRAILLE */ - -/* Multimedia keys, defined same as on Linux - * /usr/include/pkg/libxkbcommon/xkbcommon/xkbcommon-keysyms.h - */ - -#ifndef TK_NO_DEPRECATED -#define XK_XF86AudioLowerVolume 0x1008FF11 /* Volume control down */ -#define XK_XF86AudioMute 0x1008FF12 /* Mute sound from the system */ -#define XK_XF86AudioRaiseVolume 0x1008FF13 /* Volume control up */ -#define XK_XF86AudioPlay 0x1008FF14 /* Start playing of audio > */ -#define XK_XF86AudioStop 0x1008FF15 /* Stop playing audio */ -#define XK_XF86AudioPrev 0x1008FF16 /* Previous track */ -#define XK_XF86AudioNext 0x1008FF17 /* Next track */ -#endif /* !TK_NO_DEPRECATED */ - |