From: Pat Thoyts Date: Wed, 14 Nov 2012 00:44:28 +0000 (+0000) Subject: Update tk to version 8.5.13 X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/cc9382fd9dfbce8ce4eec45fa6b034983a1bd8de Update tk to version 8.5.13 Signed-off-by: Pat Thoyts --- diff --git a/mingw/bin/tk85.dll b/mingw/bin/tk85.dll dissimilarity index 81% index 5a4907c0..144a5f4f 100644 Binary files a/mingw/bin/tk85.dll and b/mingw/bin/tk85.dll differ diff --git a/mingw/bin/wish.exe b/mingw/bin/wish.exe dissimilarity index 80% index 75c3677d..fbf4ff69 100644 Binary files a/mingw/bin/wish.exe and b/mingw/bin/wish.exe differ diff --git a/mingw/bin/wish85.exe b/mingw/bin/wish85.exe dissimilarity index 80% index 75c3677d..fbf4ff69 100644 Binary files a/mingw/bin/wish85.exe and b/mingw/bin/wish85.exe differ diff --git a/mingw/include/X11/X.h b/mingw/include/X11/X.h index bdc4f136..daf22830 100644 --- a/mingw/include/X11/X.h +++ b/mingw/include/X11/X.h @@ -13,13 +13,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -100,39 +100,39 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs #define NoSymbol 0L /* special KeySym */ -/***************************************************************** - * EVENT DEFINITIONS +/***************************************************************** + * EVENT DEFINITIONS *****************************************************************/ /* Input Event Masks. Used as event-mask window attribute and as arguments to Grab requests. Not to be confused with event names. */ #define NoEventMask 0L -#define KeyPressMask (1L<<0) -#define KeyReleaseMask (1L<<1) -#define ButtonPressMask (1L<<2) -#define ButtonReleaseMask (1L<<3) -#define EnterWindowMask (1L<<4) -#define LeaveWindowMask (1L<<5) -#define PointerMotionMask (1L<<6) -#define PointerMotionHintMask (1L<<7) -#define Button1MotionMask (1L<<8) -#define Button2MotionMask (1L<<9) -#define Button3MotionMask (1L<<10) -#define Button4MotionMask (1L<<11) -#define Button5MotionMask (1L<<12) -#define ButtonMotionMask (1L<<13) +#define KeyPressMask (1L<<0) +#define KeyReleaseMask (1L<<1) +#define ButtonPressMask (1L<<2) +#define ButtonReleaseMask (1L<<3) +#define EnterWindowMask (1L<<4) +#define LeaveWindowMask (1L<<5) +#define PointerMotionMask (1L<<6) +#define PointerMotionHintMask (1L<<7) +#define Button1MotionMask (1L<<8) +#define Button2MotionMask (1L<<9) +#define Button3MotionMask (1L<<10) +#define Button4MotionMask (1L<<11) +#define Button5MotionMask (1L<<12) +#define ButtonMotionMask (1L<<13) #define KeymapStateMask (1L<<14) -#define ExposureMask (1L<<15) -#define VisibilityChangeMask (1L<<16) -#define StructureNotifyMask (1L<<17) -#define ResizeRedirectMask (1L<<18) -#define SubstructureNotifyMask (1L<<19) -#define SubstructureRedirectMask (1L<<20) -#define FocusChangeMask (1L<<21) -#define PropertyChangeMask (1L<<22) -#define ColormapChangeMask (1L<<23) -#define OwnerGrabButtonMask (1L<<24) +#define ExposureMask (1L<<15) +#define VisibilityChangeMask (1L<<16) +#define StructureNotifyMask (1L<<17) +#define ResizeRedirectMask (1L<<18) +#define SubstructureNotifyMask (1L<<19) +#define SubstructureRedirectMask (1L<<20) +#define FocusChangeMask (1L<<21) +#define PropertyChangeMask (1L<<22) +#define ColormapChangeMask (1L<<23) +#define OwnerGrabButtonMask (1L<<24) /* Event names. Used in "type" field in XEvent structures. Not to be confused with event masks above. They start from 2 because 0 and 1 @@ -229,7 +229,7 @@ are reserved in the protocol for errors and replies. */ #define NotifyWhileGrabbed 3 #define NotifyHint 1 /* for MotionNotify events */ - + /* Notify detail */ #define NotifyAncestor 0 @@ -299,7 +299,7 @@ are reserved in the protocol for errors and replies. */ #define RevertToParent 2 /***************************************************************** - * ERROR CODES + * ERROR CODES *****************************************************************/ #define Success 0 /* everything's okay */ @@ -314,9 +314,9 @@ are reserved in the protocol for errors and replies. */ #define BadDrawable 9 /* parameter not a Pixmap or Window */ #define BadAccess 10 /* depending on context: - key/button already grabbed - - attempt to free an illegal - cmap entry - - attempt to store into a read-only + - attempt to free an illegal + cmap entry + - attempt to store into a read-only color map entry. - attempt to modify the access control list from other than the local host. @@ -333,7 +333,7 @@ are reserved in the protocol for errors and replies. */ #define LastExtensionError 255 /***************************************************************** - * WINDOW DEFINITIONS + * WINDOW DEFINITIONS *****************************************************************/ /* Window classes used by CreateWindow */ @@ -525,7 +525,7 @@ are reserved in the protocol for errors and replies. */ #define GCCapStyle (1L<<6) #define GCJoinStyle (1L<<7) #define GCFillStyle (1L<<8) -#define GCFillRule (1L<<9) +#define GCFillRule (1L<<9) #define GCTile (1L<<10) #define GCStipple (1L<<11) #define GCTileStipXOrigin (1L<<12) @@ -542,7 +542,7 @@ are reserved in the protocol for errors and replies. */ #define GCLastBit 22 /***************************************************************** - * FONTS + * FONTS *****************************************************************/ /* used in QueryFont -- draw direction */ @@ -553,7 +553,7 @@ are reserved in the protocol for errors and replies. */ #define FontChange 255 /***************************************************************** - * IMAGING + * IMAGING *****************************************************************/ /* ImageFormat -- PutImage, GetImage */ @@ -563,7 +563,7 @@ are reserved in the protocol for errors and replies. */ #define ZPixmap 2 /* depth == drawable depth */ /***************************************************************** - * COLOR MAP STUFF + * COLOR MAP STUFF *****************************************************************/ /* For CreateColormap */ @@ -588,7 +588,7 @@ are reserved in the protocol for errors and replies. */ #define TileShape 1 /* size tiled fastest */ #define StippleShape 2 /* size stippled fastest */ -/***************************************************************** +/***************************************************************** * KEYBOARD/POINTER STUFF *****************************************************************/ @@ -619,7 +619,7 @@ are reserved in the protocol for errors and replies. */ #define MappingPointer 2 /***************************************************************** - * SCREEN SAVER STUFF + * SCREEN SAVER STUFF *****************************************************************/ #define DontPreferBlanking 0 @@ -649,10 +649,10 @@ are reserved in the protocol for errors and replies. */ /* for ChangeAccessControl */ -#define EnableAccess 1 +#define EnableAccess 1 #define DisableAccess 0 -/* Display classes used in opening the connection +/* Display classes used in opening the connection * Note that the statically allocated ones are even numbered and the * dynamically changeable ones are odd numbered */ diff --git a/mingw/include/X11/Xfuncproto.h b/mingw/include/X11/Xfuncproto.h index a59379b3..6d63002e 100644 --- a/mingw/include/X11/Xfuncproto.h +++ b/mingw/include/X11/Xfuncproto.h @@ -1,14 +1,14 @@ /* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */ -/* +/* * Copyright 1989, 1991 by the Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting + * documentation for any purpose and without fee is hereby granted, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting * documentation, and that the name of M.I.T. not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. M.I.T. makes no representations about the + * or publicity pertaining to distribution of the software without specific, + * written prior permission. M.I.T. makes no representations about the * suitability of this software for any purpose. It is provided "as is" * without express or implied warranty. * diff --git a/mingw/include/X11/Xlib.h b/mingw/include/X11/Xlib.h index 3af3682a..667bdc77 100644 --- a/mingw/include/X11/Xlib.h +++ b/mingw/include/X11/Xlib.h @@ -1,14 +1,14 @@ /* $XConsortium: Xlib.h,v 11.221 93/07/02 14:13:28 gildea Exp $ */ -/* +/* * Copyright 1985, 1986, 1987, 1991 by the Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting + * documentation for any purpose and without fee is hereby granted, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting * documentation, and that the name of M.I.T. not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. M.I.T. makes no representations about the + * or publicity pertaining to distribution of the software without specific, + * written prior permission. M.I.T. makes no representations about the * suitability of this software for any purpose. It is provided "as is" * without express or implied warranty. * @@ -163,10 +163,10 @@ typedef struct { unsigned long background;/* background pixel */ int line_width; /* line width */ int line_style; /* LineSolid, LineOnOffDash, LineDoubleDash */ - int cap_style; /* CapNotLast, CapButt, + int cap_style; /* CapNotLast, CapButt, CapRound, CapProjecting */ int join_style; /* JoinMiter, JoinRound, JoinBevel */ - int fill_style; /* FillSolid, FillTiled, + int fill_style; /* FillSolid, FillTiled, FillStippled, FillOpaeueStippled */ int fill_rule; /* EvenOddRule, WindingRule */ int arc_mode; /* ArcChord, ArcPieSlice */ @@ -209,7 +209,7 @@ typedef struct { /* * Depth structure; contains information for each possible depth. - */ + */ typedef struct { int depth; /* this depth (Z) of the depth */ int nvisuals; /* number of Visual types at this depth */ @@ -237,7 +237,7 @@ typedef struct { unsigned long black_pixel; /* White and Black pixel values */ int max_maps, min_maps; /* max and min color maps */ int backing_store; /* Never, WhenMapped, Always */ - Bool save_unders; + Bool save_unders; long root_input_mask; /* initial root input mask */ } Screen; @@ -348,7 +348,7 @@ typedef struct _XImage { } f; } XImage; -/* +/* * Data structure for XReconfigureWindow */ typedef struct { @@ -369,7 +369,7 @@ typedef struct { char pad; } XColor; -/* +/* * Data structures for graphics operations. On most machines, these are * congruent with the wire protocol structures, so reformatting the data * can be avoided on these architectures. @@ -381,12 +381,12 @@ typedef struct { typedef struct { short x, y; } XPoint; - + typedef struct { short x, y; unsigned short width, height; } XRectangle; - + typedef struct { short x, y; unsigned short width, height; @@ -487,7 +487,7 @@ typedef struct _XDisplay { struct _XExten *ext_procs; /* extensions initialized on this display */ /* * the following can be fixed size, as the protocol defines how - * much address space is available. + * much address space is available. * While this could be done using the extension vector, there * may be MANY events processed, so a search through the extension * list to find the right procedure for each event might be @@ -602,7 +602,7 @@ typedef struct { int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */ int detail; /* - * NotifyAncestor, NotifyVirtual, NotifyInferior, + * NotifyAncestor, NotifyVirtual, NotifyInferior, * NotifyNonlinear,NotifyNonlinearVirtual */ Bool same_screen; /* same screen flag */ @@ -621,9 +621,9 @@ typedef struct { int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */ int detail; /* - * NotifyAncestor, NotifyVirtual, NotifyInferior, + * NotifyAncestor, NotifyVirtual, NotifyInferior, * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer, - * NotifyPointerRoot, NotifyDetailNone + * NotifyPointerRoot, NotifyDetailNone */ } XFocusChangeEvent; typedef XFocusChangeEvent XFocusInEvent; @@ -637,7 +637,7 @@ typedef struct { Display *display; /* Display the event was read from */ Window window; char key_vector[32]; -} XKeymapEvent; +} XKeymapEvent; typedef struct { int type; @@ -1124,7 +1124,7 @@ typedef struct { typedef unsigned long XIMFeedback; #define XIMReverse 1 -#define XIMUnderline (1<<1) +#define XIMUnderline (1<<1) #define XIMHighlight (1<<2) #define XIMPrimary (1<<5) #define XIMSecondary (1<<6) @@ -1133,11 +1133,11 @@ typedef unsigned long XIMFeedback; typedef struct _XIMText { unsigned short length; XIMFeedback *feedback; - Bool encoding_is_wchar; + Bool encoding_is_wchar; union { char *multi_byte; wchar_t *wide_char; - } string; + } string; } XIMText; typedef struct _XIMPreeditDrawCallbackStruct { @@ -1152,13 +1152,13 @@ typedef enum { XIMForwardWord, XIMBackwardWord, XIMCaretUp, XIMCaretDown, XIMNextLine, XIMPreviousLine, - XIMLineStart, XIMLineEnd, + XIMLineStart, XIMLineEnd, XIMAbsolutePosition, XIMDontChange } XIMCaretDirection; typedef enum { - XIMIsInvisible, /* Disable caret feedback */ + XIMIsInvisible, /* Disable caret feedback */ XIMIsPrimary, /* UI defined caret feedback */ XIMIsSecondary /* UI defined caret feedback */ } XIMCaretStyle; @@ -1173,7 +1173,7 @@ typedef enum { XIMTextType, XIMBitmapType } XIMStatusDataType; - + typedef struct _XIMStatusDrawCallbackStruct { XIMStatusDataType type; union { diff --git a/mingw/include/X11/Xutil.h b/mingw/include/X11/Xutil.h index 7348e903..58124b04 100644 --- a/mingw/include/X11/Xutil.h +++ b/mingw/include/X11/Xutil.h @@ -6,13 +6,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -33,7 +33,7 @@ SOFTWARE. # define Region XRegion #endif -/* +/* * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding * value (x, y, width, height) was found in the parsed string. */ @@ -128,7 +128,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint) /* - * new structure for manipulating TEXT properties; used with WM_NAME, + * new structure for manipulating TEXT properties; used with WM_NAME, * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND. */ typedef struct { @@ -206,16 +206,16 @@ typedef struct _XComposeStatus { || ((unsigned)(keysym) == XK_Mode_switch) \ || ((unsigned)(keysym) == XK_Num_Lock)) /* - * opaque reference to Region data type + * opaque reference to Region data type */ -typedef struct _XRegion *Region; +typedef struct _XRegion *Region; /* Return values from XRectInRegion() */ - + #define RectangleOut 0 #define RectangleIn 1 #define RectanglePart 2 - + /* * Information used by the visual utility routines to find desired visual @@ -435,7 +435,7 @@ extern Status XGetStandardColormap( Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, - Atom /* property */ + Atom /* property */ #endif ); @@ -460,7 +460,7 @@ extern Status XGetWMClientMachine( extern XWMHints *XGetWMHints( #if NeedFunctionPrototypes Display* /* display */, - Window /* w */ + Window /* w */ #endif ); @@ -485,7 +485,7 @@ extern Status XGetWMNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, - long* /* supplied_return */ + long* /* supplied_return */ #endif ); @@ -591,7 +591,7 @@ extern void XSetIconSizes( Display* /* display */, Window /* w */, XIconSize* /* size_list */, - int /* count */ + int /* count */ #endif ); diff --git a/mingw/include/X11/keysym.h b/mingw/include/X11/keysym.h index a8f14089..550b76db 100644 --- a/mingw/include/X11/keysym.h +++ b/mingw/include/X11/keysym.h @@ -6,13 +6,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/mingw/include/tk.h b/mingw/include/tk.h index af7b05cf..8c13df26 100644 --- a/mingw/include/tk.h +++ b/mingw/include/tk.h @@ -51,10 +51,10 @@ extern "C" { #define TK_MAJOR_VERSION 8 #define TK_MINOR_VERSION 5 #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 11 +#define TK_RELEASE_SERIAL 13 #define TK_VERSION "8.5" -#define TK_PATCH_LEVEL "8.5.11" +#define TK_PATCH_LEVEL "8.5.13" /* * A special definition used to allow this header file to be included from diff --git a/mingw/include/tkIntXlibDecls.h b/mingw/include/tkIntXlibDecls.h index bf803425..1357ceb9 100644 --- a/mingw/include/tkIntXlibDecls.h +++ b/mingw/include/tkIntXlibDecls.h @@ -13,18 +13,26 @@ #ifndef _TKINTXLIBDECLS #define _TKINTXLIBDECLS +/* + * WARNING: This file is automatically generated by the tools/genStubs.tcl + * script. Any modifications to the function declarations below should be made + * in the generic/tkInt.decls script. + */ + +#ifdef MAC_TCL +#include "Xutil.h" +#else #include "X11/Xutil.h" +#endif #ifdef BUILD_tk #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLEXPORT #endif -/* - * WARNING: This file is automatically generated by the tools/genStubs.tcl - * script. Any modifications to the function declarations below should be made - * in the generic/tkInt.decls script. - */ +typedef int (*XAfterFunction) ( /* WARNING, this type not in Xlib spec */ + Display* /* display */ +); /* !BEGIN!: Do not edit below this line. */ @@ -32,11 +40,11 @@ * Exported function declarations: */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #ifndef XSetDashes_TCL_DECLARED #define XSetDashes_TCL_DECLARED /* 0 */ -EXTERN void XSetDashes(Display *display, GC gc, int dash_offset, +EXTERN int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); #endif #ifndef XGetModifierMapping_TCL_DECLARED @@ -86,7 +94,7 @@ EXTERN Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, /* 8 */ EXTERN Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, - XColor *x1, XColor *x2); + XColor _Xconst *x1, XColor _Xconst *x2); #endif #ifndef XGContextFromGC_TCL_DECLARED #define XGContextFromGC_TCL_DECLARED @@ -142,43 +150,43 @@ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); #ifndef XBell_TCL_DECLARED #define XBell_TCL_DECLARED /* 19 */ -EXTERN void XBell(Display *d, int i); +EXTERN int XBell(Display *d, int i); #endif #ifndef XChangeProperty_TCL_DECLARED #define XChangeProperty_TCL_DECLARED /* 20 */ -EXTERN void XChangeProperty(Display *d, Window w, Atom a1, +EXTERN int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); #endif #ifndef XChangeWindowAttributes_TCL_DECLARED #define XChangeWindowAttributes_TCL_DECLARED /* 21 */ -EXTERN void XChangeWindowAttributes(Display *d, Window w, +EXTERN int XChangeWindowAttributes(Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); #endif #ifndef XClearWindow_TCL_DECLARED #define XClearWindow_TCL_DECLARED /* 22 */ -EXTERN void XClearWindow(Display *d, Window w); +EXTERN int XClearWindow(Display *d, Window w); #endif #ifndef XConfigureWindow_TCL_DECLARED #define XConfigureWindow_TCL_DECLARED /* 23 */ -EXTERN void XConfigureWindow(Display *d, Window w, +EXTERN int XConfigureWindow(Display *d, Window w, unsigned int i, XWindowChanges *x); #endif #ifndef XCopyArea_TCL_DECLARED #define XCopyArea_TCL_DECLARED /* 24 */ -EXTERN void XCopyArea(Display *d, Drawable dr1, Drawable dr2, +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); #endif #ifndef XCopyPlane_TCL_DECLARED #define XCopyPlane_TCL_DECLARED /* 25 */ -EXTERN void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, +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); @@ -193,81 +201,81 @@ EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d, #ifndef XDefineCursor_TCL_DECLARED #define XDefineCursor_TCL_DECLARED /* 27 */ -EXTERN void XDefineCursor(Display *d, Window w, Cursor c); +EXTERN int XDefineCursor(Display *d, Window w, Cursor c); #endif #ifndef XDeleteProperty_TCL_DECLARED #define XDeleteProperty_TCL_DECLARED /* 28 */ -EXTERN void XDeleteProperty(Display *d, Window w, Atom a); +EXTERN int XDeleteProperty(Display *d, Window w, Atom a); #endif #ifndef XDestroyWindow_TCL_DECLARED #define XDestroyWindow_TCL_DECLARED /* 29 */ -EXTERN void XDestroyWindow(Display *d, Window w); +EXTERN int XDestroyWindow(Display *d, Window w); #endif #ifndef XDrawArc_TCL_DECLARED #define XDrawArc_TCL_DECLARED /* 30 */ -EXTERN void XDrawArc(Display *d, Drawable dr, GC g, int i1, +EXTERN int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); #endif #ifndef XDrawLines_TCL_DECLARED #define XDrawLines_TCL_DECLARED /* 31 */ -EXTERN void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, +EXTERN int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); #endif #ifndef XDrawRectangle_TCL_DECLARED #define XDrawRectangle_TCL_DECLARED /* 32 */ -EXTERN void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, +EXTERN int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); #endif #ifndef XFillArc_TCL_DECLARED #define XFillArc_TCL_DECLARED /* 33 */ -EXTERN void XFillArc(Display *d, Drawable dr, GC g, int i1, +EXTERN int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); #endif #ifndef XFillPolygon_TCL_DECLARED #define XFillPolygon_TCL_DECLARED /* 34 */ -EXTERN void XFillPolygon(Display *d, Drawable dr, GC g, +EXTERN int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); #endif #ifndef XFillRectangles_TCL_DECLARED #define XFillRectangles_TCL_DECLARED /* 35 */ -EXTERN void XFillRectangles(Display *d, Drawable dr, GC g, +EXTERN int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i); #endif #ifndef XForceScreenSaver_TCL_DECLARED #define XForceScreenSaver_TCL_DECLARED /* 36 */ -EXTERN void XForceScreenSaver(Display *d, int i); +EXTERN int XForceScreenSaver(Display *d, int i); #endif #ifndef XFreeColormap_TCL_DECLARED #define XFreeColormap_TCL_DECLARED /* 37 */ -EXTERN void XFreeColormap(Display *d, Colormap c); +EXTERN int XFreeColormap(Display *d, Colormap c); #endif #ifndef XFreeColors_TCL_DECLARED #define XFreeColors_TCL_DECLARED /* 38 */ -EXTERN void XFreeColors(Display *d, Colormap c, +EXTERN int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); #endif #ifndef XFreeCursor_TCL_DECLARED #define XFreeCursor_TCL_DECLARED /* 39 */ -EXTERN void XFreeCursor(Display *d, Cursor c); +EXTERN int XFreeCursor(Display *d, Cursor c); #endif #ifndef XFreeModifiermap_TCL_DECLARED #define XFreeModifiermap_TCL_DECLARED /* 40 */ -EXTERN void XFreeModifiermap(XModifierKeymap *x); +EXTERN int XFreeModifiermap(XModifierKeymap *x); #endif #ifndef XGetGeometry_TCL_DECLARED #define XGetGeometry_TCL_DECLARED @@ -280,7 +288,7 @@ EXTERN Status XGetGeometry(Display *d, Drawable dr, Window *w, #ifndef XGetInputFocus_TCL_DECLARED #define XGetInputFocus_TCL_DECLARED /* 42 */ -EXTERN void XGetInputFocus(Display *d, Window *w, int *i); +EXTERN int XGetInputFocus(Display *d, Window *w, int *i); #endif #ifndef XGetWindowProperty_TCL_DECLARED #define XGetWindowProperty_TCL_DECLARED @@ -323,33 +331,33 @@ EXTERN Status XLookupColor(Display *d, Colormap c1, #ifndef XMapWindow_TCL_DECLARED #define XMapWindow_TCL_DECLARED /* 49 */ -EXTERN void XMapWindow(Display *d, Window w); +EXTERN int XMapWindow(Display *d, Window w); #endif #ifndef XMoveResizeWindow_TCL_DECLARED #define XMoveResizeWindow_TCL_DECLARED /* 50 */ -EXTERN void XMoveResizeWindow(Display *d, Window w, int i1, +EXTERN int XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); #endif #ifndef XMoveWindow_TCL_DECLARED #define XMoveWindow_TCL_DECLARED /* 51 */ -EXTERN void XMoveWindow(Display *d, Window w, int i1, int i2); +EXTERN int XMoveWindow(Display *d, Window w, int i1, int i2); #endif #ifndef XNextEvent_TCL_DECLARED #define XNextEvent_TCL_DECLARED /* 52 */ -EXTERN void XNextEvent(Display *d, XEvent *x); +EXTERN int XNextEvent(Display *d, XEvent *x); #endif #ifndef XPutBackEvent_TCL_DECLARED #define XPutBackEvent_TCL_DECLARED /* 53 */ -EXTERN void XPutBackEvent(Display *d, XEvent *x); +EXTERN int XPutBackEvent(Display *d, XEvent *x); #endif #ifndef XQueryColors_TCL_DECLARED #define XQueryColors_TCL_DECLARED /* 54 */ -EXTERN void XQueryColors(Display *d, Colormap c, XColor *x, +EXTERN int XQueryColors(Display *d, Colormap c, XColor *x, int i); #endif #ifndef XQueryPointer_TCL_DECLARED @@ -368,23 +376,23 @@ EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, #ifndef XRaiseWindow_TCL_DECLARED #define XRaiseWindow_TCL_DECLARED /* 57 */ -EXTERN void XRaiseWindow(Display *d, Window w); +EXTERN int XRaiseWindow(Display *d, Window w); #endif #ifndef XRefreshKeyboardMapping_TCL_DECLARED #define XRefreshKeyboardMapping_TCL_DECLARED /* 58 */ -EXTERN void XRefreshKeyboardMapping(XMappingEvent *x); +EXTERN int XRefreshKeyboardMapping(XMappingEvent *x); #endif #ifndef XResizeWindow_TCL_DECLARED #define XResizeWindow_TCL_DECLARED /* 59 */ -EXTERN void XResizeWindow(Display *d, Window w, unsigned int ui1, +EXTERN int XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2); #endif #ifndef XSelectInput_TCL_DECLARED #define XSelectInput_TCL_DECLARED /* 60 */ -EXTERN void XSelectInput(Display *d, Window w, long l); +EXTERN int XSelectInput(Display *d, Window w, long l); #endif #ifndef XSendEvent_TCL_DECLARED #define XSendEvent_TCL_DECLARED @@ -395,59 +403,58 @@ EXTERN Status XSendEvent(Display *d, Window w, Bool b, long l, #ifndef XSetCommand_TCL_DECLARED #define XSetCommand_TCL_DECLARED /* 62 */ -EXTERN void XSetCommand(Display *d, Window w, CONST char **c, - int i); +EXTERN int XSetCommand(Display *d, Window w, char **c, int i); #endif #ifndef XSetIconName_TCL_DECLARED #define XSetIconName_TCL_DECLARED /* 63 */ -EXTERN void XSetIconName(Display *d, Window w, _Xconst char *c); +EXTERN int XSetIconName(Display *d, Window w, _Xconst char *c); #endif #ifndef XSetInputFocus_TCL_DECLARED #define XSetInputFocus_TCL_DECLARED /* 64 */ -EXTERN void XSetInputFocus(Display *d, Window w, int i, Time t); +EXTERN int XSetInputFocus(Display *d, Window w, int i, Time t); #endif #ifndef XSetSelectionOwner_TCL_DECLARED #define XSetSelectionOwner_TCL_DECLARED /* 65 */ -EXTERN void XSetSelectionOwner(Display *d, Atom a, Window w, +EXTERN int XSetSelectionOwner(Display *d, Atom a, Window w, Time t); #endif #ifndef XSetWindowBackground_TCL_DECLARED #define XSetWindowBackground_TCL_DECLARED /* 66 */ -EXTERN void XSetWindowBackground(Display *d, Window w, +EXTERN int XSetWindowBackground(Display *d, Window w, unsigned long ul); #endif #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED #define XSetWindowBackgroundPixmap_TCL_DECLARED /* 67 */ -EXTERN void XSetWindowBackgroundPixmap(Display *d, Window w, +EXTERN int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p); #endif #ifndef XSetWindowBorder_TCL_DECLARED #define XSetWindowBorder_TCL_DECLARED /* 68 */ -EXTERN void XSetWindowBorder(Display *d, Window w, +EXTERN int XSetWindowBorder(Display *d, Window w, unsigned long ul); #endif #ifndef XSetWindowBorderPixmap_TCL_DECLARED #define XSetWindowBorderPixmap_TCL_DECLARED /* 69 */ -EXTERN void XSetWindowBorderPixmap(Display *d, Window w, +EXTERN int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p); #endif #ifndef XSetWindowBorderWidth_TCL_DECLARED #define XSetWindowBorderWidth_TCL_DECLARED /* 70 */ -EXTERN void XSetWindowBorderWidth(Display *d, Window w, +EXTERN int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui); #endif #ifndef XSetWindowColormap_TCL_DECLARED #define XSetWindowColormap_TCL_DECLARED /* 71 */ -EXTERN void XSetWindowColormap(Display *d, Window w, Colormap c); +EXTERN int XSetWindowColormap(Display *d, Window w, Colormap c); #endif #ifndef XTranslateCoordinates_TCL_DECLARED #define XTranslateCoordinates_TCL_DECLARED @@ -459,22 +466,22 @@ EXTERN Bool XTranslateCoordinates(Display *d, Window w1, #ifndef XUngrabKeyboard_TCL_DECLARED #define XUngrabKeyboard_TCL_DECLARED /* 73 */ -EXTERN void XUngrabKeyboard(Display *d, Time t); +EXTERN int XUngrabKeyboard(Display *d, Time t); #endif #ifndef XUngrabPointer_TCL_DECLARED #define XUngrabPointer_TCL_DECLARED /* 74 */ -EXTERN void XUngrabPointer(Display *d, Time t); +EXTERN int XUngrabPointer(Display *d, Time t); #endif #ifndef XUnmapWindow_TCL_DECLARED #define XUnmapWindow_TCL_DECLARED /* 75 */ -EXTERN void XUnmapWindow(Display *d, Window w); +EXTERN int XUnmapWindow(Display *d, Window w); #endif #ifndef XWindowEvent_TCL_DECLARED #define XWindowEvent_TCL_DECLARED /* 76 */ -EXTERN void XWindowEvent(Display *d, Window w, long l, XEvent *x); +EXTERN int XWindowEvent(Display *d, Window w, long l, XEvent *x); #endif #ifndef XDestroyIC_TCL_DECLARED #define XDestroyIC_TCL_DECLARED @@ -495,7 +502,7 @@ EXTERN int XmbLookupString(XIC xi, XKeyPressedEvent *xk, #ifndef TkPutImage_TCL_DECLARED #define TkPutImage_TCL_DECLARED /* 80 */ -EXTERN void TkPutImage(unsigned long *colors, int ncolors, +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, @@ -517,7 +524,7 @@ EXTERN GC XCreateGC(Display *display, Drawable d, #ifndef XFreeGC_TCL_DECLARED #define XFreeGC_TCL_DECLARED /* 84 */ -EXTERN void XFreeGC(Display *display, GC gc); +EXTERN int XFreeGC(Display *display, GC gc); #endif #ifndef XInternAtom_TCL_DECLARED #define XInternAtom_TCL_DECLARED @@ -528,73 +535,73 @@ EXTERN Atom XInternAtom(Display *display, #ifndef XSetBackground_TCL_DECLARED #define XSetBackground_TCL_DECLARED /* 86 */ -EXTERN void XSetBackground(Display *display, GC gc, +EXTERN int XSetBackground(Display *display, GC gc, unsigned long foreground); #endif #ifndef XSetForeground_TCL_DECLARED #define XSetForeground_TCL_DECLARED /* 87 */ -EXTERN void XSetForeground(Display *display, GC gc, +EXTERN int XSetForeground(Display *display, GC gc, unsigned long foreground); #endif #ifndef XSetClipMask_TCL_DECLARED #define XSetClipMask_TCL_DECLARED /* 88 */ -EXTERN void XSetClipMask(Display *display, GC gc, Pixmap pixmap); +EXTERN int XSetClipMask(Display *display, GC gc, Pixmap pixmap); #endif #ifndef XSetClipOrigin_TCL_DECLARED #define XSetClipOrigin_TCL_DECLARED /* 89 */ -EXTERN void XSetClipOrigin(Display *display, GC gc, +EXTERN int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin); #endif #ifndef XSetTSOrigin_TCL_DECLARED #define XSetTSOrigin_TCL_DECLARED /* 90 */ -EXTERN void XSetTSOrigin(Display *display, GC gc, +EXTERN int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin); #endif #ifndef XChangeGC_TCL_DECLARED #define XChangeGC_TCL_DECLARED /* 91 */ -EXTERN void XChangeGC(Display *d, GC gc, unsigned long mask, +EXTERN int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values); #endif #ifndef XSetFont_TCL_DECLARED #define XSetFont_TCL_DECLARED /* 92 */ -EXTERN void XSetFont(Display *display, GC gc, Font font); +EXTERN int XSetFont(Display *display, GC gc, Font font); #endif #ifndef XSetArcMode_TCL_DECLARED #define XSetArcMode_TCL_DECLARED /* 93 */ -EXTERN void XSetArcMode(Display *display, GC gc, int arc_mode); +EXTERN int XSetArcMode(Display *display, GC gc, int arc_mode); #endif #ifndef XSetStipple_TCL_DECLARED #define XSetStipple_TCL_DECLARED /* 94 */ -EXTERN void XSetStipple(Display *display, GC gc, Pixmap stipple); +EXTERN int XSetStipple(Display *display, GC gc, Pixmap stipple); #endif #ifndef XSetFillRule_TCL_DECLARED #define XSetFillRule_TCL_DECLARED /* 95 */ -EXTERN void XSetFillRule(Display *display, GC gc, int fill_rule); +EXTERN int XSetFillRule(Display *display, GC gc, int fill_rule); #endif #ifndef XSetFillStyle_TCL_DECLARED #define XSetFillStyle_TCL_DECLARED /* 96 */ -EXTERN void XSetFillStyle(Display *display, GC gc, +EXTERN int XSetFillStyle(Display *display, GC gc, int fill_style); #endif #ifndef XSetFunction_TCL_DECLARED #define XSetFunction_TCL_DECLARED /* 97 */ -EXTERN void XSetFunction(Display *display, GC gc, int function); +EXTERN int XSetFunction(Display *display, GC gc, int function); #endif #ifndef XSetLineAttributes_TCL_DECLARED #define XSetLineAttributes_TCL_DECLARED /* 98 */ -EXTERN void XSetLineAttributes(Display *display, GC gc, +EXTERN int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); #endif @@ -606,7 +613,7 @@ EXTERN int _XInitImageFuncPtrs(XImage *image); #ifndef XCreateIC_TCL_DECLARED #define XCreateIC_TCL_DECLARED /* 100 */ -EXTERN XIC XCreateIC(void); +EXTERN XIC XCreateIC(XIM xim, ...); #endif #ifndef XGetVisualInfo_TCL_DECLARED #define XGetVisualInfo_TCL_DECLARED @@ -630,29 +637,69 @@ EXTERN Status XStringListToTextProperty(char **list, int count, #ifndef XDrawLine_TCL_DECLARED #define XDrawLine_TCL_DECLARED /* 104 */ -EXTERN void XDrawLine(Display *d, Drawable dr, GC g, int x1, +EXTERN int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); #endif #ifndef XWarpPointer_TCL_DECLARED #define XWarpPointer_TCL_DECLARED /* 105 */ -EXTERN void XWarpPointer(Display *d, Window s, Window dw, int sx, +EXTERN int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); #endif #ifndef XFillRectangle_TCL_DECLARED #define XFillRectangle_TCL_DECLARED /* 106 */ -EXTERN void XFillRectangle(Display *display, Drawable d, GC gc, +EXTERN int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); #endif +#ifndef XFlush_TCL_DECLARED +#define XFlush_TCL_DECLARED +/* 107 */ +EXTERN int XFlush(Display *display); +#endif +#ifndef XGrabServer_TCL_DECLARED +#define XGrabServer_TCL_DECLARED +/* 108 */ +EXTERN int XGrabServer(Display *display); +#endif +#ifndef XUngrabServer_TCL_DECLARED +#define XUngrabServer_TCL_DECLARED +/* 109 */ +EXTERN int XUngrabServer(Display *display); +#endif +#ifndef XFree_TCL_DECLARED +#define XFree_TCL_DECLARED +/* 110 */ +EXTERN int XFree(VOID *data); +#endif +#ifndef XNoOp_TCL_DECLARED +#define XNoOp_TCL_DECLARED +/* 111 */ +EXTERN int XNoOp(Display *display); +#endif +#ifndef XSynchronize_TCL_DECLARED +#define XSynchronize_TCL_DECLARED +/* 112 */ +EXTERN XAfterFunction XSynchronize(Display *display, Bool onoff); +#endif +#ifndef XSync_TCL_DECLARED +#define XSync_TCL_DECLARED +/* 113 */ +EXTERN int XSync(Display *display, Bool discard); +#endif +#ifndef XVisualIDFromVisual_TCL_DECLARED +#define XVisualIDFromVisual_TCL_DECLARED +/* 114 */ +EXTERN VisualID XVisualIDFromVisual(Visual *visual); +#endif #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ #ifndef XSetDashes_TCL_DECLARED #define XSetDashes_TCL_DECLARED /* 0 */ -EXTERN void XSetDashes(Display *display, GC gc, int dash_offset, +EXTERN int XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); #endif #ifndef XGetModifierMapping_TCL_DECLARED @@ -723,7 +770,7 @@ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp); #ifndef XBell_TCL_DECLARED #define XBell_TCL_DECLARED /* 13 */ -EXTERN void XBell(Display *d, int i); +EXTERN int XBell(Display *d, int i); #endif #ifndef XChangeProperty_TCL_DECLARED #define XChangeProperty_TCL_DECLARED @@ -769,7 +816,7 @@ EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d, #ifndef XDefineCursor_TCL_DECLARED #define XDefineCursor_TCL_DECLARED /* 20 */ -EXTERN void XDefineCursor(Display *d, Window w, Cursor c); +EXTERN int XDefineCursor(Display *d, Window w, Cursor c); #endif #ifndef XDestroyWindow_TCL_DECLARED #define XDestroyWindow_TCL_DECLARED @@ -786,7 +833,7 @@ EXTERN void XDrawArc(Display *d, Drawable dr, GC g, int i1, #ifndef XDrawLines_TCL_DECLARED #define XDrawLines_TCL_DECLARED /* 23 */ -EXTERN void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, +EXTERN int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); #endif #ifndef XDrawRectangle_TCL_DECLARED @@ -811,24 +858,24 @@ EXTERN void XFillPolygon(Display *d, Drawable dr, GC g, #ifndef XFillRectangles_TCL_DECLARED #define XFillRectangles_TCL_DECLARED /* 27 */ -EXTERN void XFillRectangles(Display *d, Drawable dr, GC g, +EXTERN int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i); #endif #ifndef XFreeColormap_TCL_DECLARED #define XFreeColormap_TCL_DECLARED /* 28 */ -EXTERN void XFreeColormap(Display *d, Colormap c); +EXTERN int XFreeColormap(Display *d, Colormap c); #endif #ifndef XFreeColors_TCL_DECLARED #define XFreeColors_TCL_DECLARED /* 29 */ -EXTERN void XFreeColors(Display *d, Colormap c, +EXTERN int XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); #endif #ifndef XFreeModifiermap_TCL_DECLARED #define XFreeModifiermap_TCL_DECLARED /* 30 */ -EXTERN void XFreeModifiermap(XModifierKeymap *x); +EXTERN int XFreeModifiermap(XModifierKeymap *x); #endif #ifndef XGetGeometry_TCL_DECLARED #define XGetGeometry_TCL_DECLARED @@ -927,7 +974,7 @@ EXTERN void XSetInputFocus(Display *d, Window w, int i, Time t); #ifndef XSetSelectionOwner_TCL_DECLARED #define XSetSelectionOwner_TCL_DECLARED /* 47 */ -EXTERN void XSetSelectionOwner(Display *d, Atom a, Window w, +EXTERN int XSetSelectionOwner(Display *d, Atom a, Window w, Time t); #endif #ifndef XSetWindowBackground_TCL_DECLARED @@ -973,7 +1020,7 @@ EXTERN void XUngrabKeyboard(Display *d, Time t); #ifndef XUngrabPointer_TCL_DECLARED #define XUngrabPointer_TCL_DECLARED /* 55 */ -EXTERN void XUngrabPointer(Display *d, Time t); +EXTERN int XUngrabPointer(Display *d, Time t); #endif #ifndef XUnmapWindow_TCL_DECLARED #define XUnmapWindow_TCL_DECLARED @@ -983,7 +1030,7 @@ EXTERN void XUnmapWindow(Display *d, Window w); #ifndef TkPutImage_TCL_DECLARED #define TkPutImage_TCL_DECLARED /* 57 */ -EXTERN void TkPutImage(unsigned long *colors, int ncolors, +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, @@ -1004,7 +1051,7 @@ EXTERN GC XCreateGC(Display *display, Drawable d, #ifndef XFreeGC_TCL_DECLARED #define XFreeGC_TCL_DECLARED /* 60 */ -EXTERN void XFreeGC(Display *display, GC gc); +EXTERN int XFreeGC(Display *display, GC gc); #endif #ifndef XInternAtom_TCL_DECLARED #define XInternAtom_TCL_DECLARED @@ -1015,73 +1062,73 @@ EXTERN Atom XInternAtom(Display *display, #ifndef XSetBackground_TCL_DECLARED #define XSetBackground_TCL_DECLARED /* 62 */ -EXTERN void XSetBackground(Display *display, GC gc, +EXTERN int XSetBackground(Display *display, GC gc, unsigned long foreground); #endif #ifndef XSetForeground_TCL_DECLARED #define XSetForeground_TCL_DECLARED /* 63 */ -EXTERN void XSetForeground(Display *display, GC gc, +EXTERN int XSetForeground(Display *display, GC gc, unsigned long foreground); #endif #ifndef XSetClipMask_TCL_DECLARED #define XSetClipMask_TCL_DECLARED /* 64 */ -EXTERN void XSetClipMask(Display *display, GC gc, Pixmap pixmap); +EXTERN int XSetClipMask(Display *display, GC gc, Pixmap pixmap); #endif #ifndef XSetClipOrigin_TCL_DECLARED #define XSetClipOrigin_TCL_DECLARED /* 65 */ -EXTERN void XSetClipOrigin(Display *display, GC gc, +EXTERN int XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin); #endif #ifndef XSetTSOrigin_TCL_DECLARED #define XSetTSOrigin_TCL_DECLARED /* 66 */ -EXTERN void XSetTSOrigin(Display *display, GC gc, +EXTERN int XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin); #endif #ifndef XChangeGC_TCL_DECLARED #define XChangeGC_TCL_DECLARED /* 67 */ -EXTERN void XChangeGC(Display *d, GC gc, unsigned long mask, +EXTERN int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values); #endif #ifndef XSetFont_TCL_DECLARED #define XSetFont_TCL_DECLARED /* 68 */ -EXTERN void XSetFont(Display *display, GC gc, Font font); +EXTERN int XSetFont(Display *display, GC gc, Font font); #endif #ifndef XSetArcMode_TCL_DECLARED #define XSetArcMode_TCL_DECLARED /* 69 */ -EXTERN void XSetArcMode(Display *display, GC gc, int arc_mode); +EXTERN int XSetArcMode(Display *display, GC gc, int arc_mode); #endif #ifndef XSetStipple_TCL_DECLARED #define XSetStipple_TCL_DECLARED /* 70 */ -EXTERN void XSetStipple(Display *display, GC gc, Pixmap stipple); +EXTERN int XSetStipple(Display *display, GC gc, Pixmap stipple); #endif #ifndef XSetFillRule_TCL_DECLARED #define XSetFillRule_TCL_DECLARED /* 71 */ -EXTERN void XSetFillRule(Display *display, GC gc, int fill_rule); +EXTERN int XSetFillRule(Display *display, GC gc, int fill_rule); #endif #ifndef XSetFillStyle_TCL_DECLARED #define XSetFillStyle_TCL_DECLARED /* 72 */ -EXTERN void XSetFillStyle(Display *display, GC gc, +EXTERN int XSetFillStyle(Display *display, GC gc, int fill_style); #endif #ifndef XSetFunction_TCL_DECLARED #define XSetFunction_TCL_DECLARED /* 73 */ -EXTERN void XSetFunction(Display *display, GC gc, int function); +EXTERN int XSetFunction(Display *display, GC gc, int function); #endif #ifndef XSetLineAttributes_TCL_DECLARED #define XSetLineAttributes_TCL_DECLARED /* 74 */ -EXTERN void XSetLineAttributes(Display *display, GC gc, +EXTERN int XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); #endif @@ -1128,13 +1175,13 @@ EXTERN void XForceScreenSaver(Display *display, int mode); #ifndef XDrawLine_TCL_DECLARED #define XDrawLine_TCL_DECLARED /* 82 */ -EXTERN void XDrawLine(Display *d, Drawable dr, GC g, int x1, +EXTERN int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); #endif #ifndef XFillRectangle_TCL_DECLARED #define XFillRectangle_TCL_DECLARED /* 83 */ -EXTERN void XFillRectangle(Display *display, Drawable d, GC gc, +EXTERN int XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); #endif @@ -1158,7 +1205,7 @@ EXTERN void XDrawPoints(Display *display, Drawable d, GC gc, #ifndef XWarpPointer_TCL_DECLARED #define XWarpPointer_TCL_DECLARED /* 87 */ -EXTERN void XWarpPointer(Display *display, Window src_w, +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, @@ -1193,8 +1240,8 @@ typedef struct TkIntXlibStubs { int magic; struct TkIntXlibStubHooks *hooks; -#ifdef __WIN32__ /* WIN */ - void (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ +#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 */ XImage * (*xGetImage) (Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3); /* 3 */ @@ -1202,7 +1249,7 @@ typedef struct TkIntXlibStubs { char * (*xKeysymToString) (KeySym k); /* 5 */ Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */ Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 7 */ - Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor *x1, XColor *x2); /* 8 */ + Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 8 */ GContext (*xGContextFromGC) (GC g); /* 9 */ XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 10 */ KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 11 */ @@ -1213,97 +1260,105 @@ typedef struct TkIntXlibStubs { Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 16 */ Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 17 */ Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 18 */ - void (*xBell) (Display *d, int i); /* 19 */ - void (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 20 */ - void (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 21 */ - void (*xClearWindow) (Display *d, Window w); /* 22 */ - void (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 23 */ - void (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 24 */ - void (*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); /* 25 */ + int (*xBell) (Display *d, int i); /* 19 */ + int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 20 */ + int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 21 */ + int (*xClearWindow) (Display *d, Window w); /* 22 */ + int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 23 */ + int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 24 */ + 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); /* 25 */ Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 26 */ - void (*xDefineCursor) (Display *d, Window w, Cursor c); /* 27 */ - void (*xDeleteProperty) (Display *d, Window w, Atom a); /* 28 */ - void (*xDestroyWindow) (Display *d, Window w); /* 29 */ - void (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 30 */ - void (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 31 */ - void (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 32 */ - void (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 33 */ - void (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 34 */ - void (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 35 */ - void (*xForceScreenSaver) (Display *d, int i); /* 36 */ - void (*xFreeColormap) (Display *d, Colormap c); /* 37 */ - void (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 38 */ - void (*xFreeCursor) (Display *d, Cursor c); /* 39 */ - void (*xFreeModifiermap) (XModifierKeymap *x); /* 40 */ + int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 27 */ + int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 28 */ + int (*xDestroyWindow) (Display *d, Window w); /* 29 */ + int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 30 */ + int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 31 */ + int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 32 */ + int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 33 */ + int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 34 */ + int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 35 */ + int (*xForceScreenSaver) (Display *d, int i); /* 36 */ + int (*xFreeColormap) (Display *d, Colormap c); /* 37 */ + int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 38 */ + int (*xFreeCursor) (Display *d, Cursor c); /* 39 */ + int (*xFreeModifiermap) (XModifierKeymap *x); /* 40 */ Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 41 */ - void (*xGetInputFocus) (Display *d, Window *w, int *i); /* 42 */ + int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 42 */ 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); /* 43 */ Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 44 */ int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 45 */ int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 46 */ KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 47 */ Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 48 */ - void (*xMapWindow) (Display *d, Window w); /* 49 */ - void (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 50 */ - void (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 51 */ - void (*xNextEvent) (Display *d, XEvent *x); /* 52 */ - void (*xPutBackEvent) (Display *d, XEvent *x); /* 53 */ - void (*xQueryColors) (Display *d, Colormap c, XColor *x, int i); /* 54 */ + int (*xMapWindow) (Display *d, Window w); /* 49 */ + int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 50 */ + int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 51 */ + int (*xNextEvent) (Display *d, XEvent *x); /* 52 */ + int (*xPutBackEvent) (Display *d, XEvent *x); /* 53 */ + int (*xQueryColors) (Display *d, Colormap c, XColor *x, int i); /* 54 */ Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 55 */ Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 56 */ - void (*xRaiseWindow) (Display *d, Window w); /* 57 */ - void (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 58 */ - void (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */ - void (*xSelectInput) (Display *d, Window w, long l); /* 60 */ + int (*xRaiseWindow) (Display *d, Window w); /* 57 */ + int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 58 */ + int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */ + int (*xSelectInput) (Display *d, Window w, long l); /* 60 */ Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 61 */ - void (*xSetCommand) (Display *d, Window w, CONST char **c, int i); /* 62 */ - void (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 63 */ - void (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 64 */ - void (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 65 */ - void (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 66 */ - void (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 67 */ - void (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 68 */ - void (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 69 */ - void (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 70 */ - void (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 71 */ + int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 62 */ + int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 63 */ + int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 64 */ + int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 65 */ + int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 66 */ + int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 67 */ + int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 68 */ + int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 69 */ + int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 70 */ + int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 71 */ Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 72 */ - void (*xUngrabKeyboard) (Display *d, Time t); /* 73 */ - void (*xUngrabPointer) (Display *d, Time t); /* 74 */ - void (*xUnmapWindow) (Display *d, Window w); /* 75 */ - void (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 76 */ + int (*xUngrabKeyboard) (Display *d, Time t); /* 73 */ + int (*xUngrabPointer) (Display *d, Time t); /* 74 */ + int (*xUnmapWindow) (Display *d, Window w); /* 75 */ + int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 76 */ void (*xDestroyIC) (XIC x); /* 77 */ Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */ int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */ - void (*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); /* 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); /* 80 */ VOID *reserved81; Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */ GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */ - void (*xFreeGC) (Display *display, GC gc); /* 84 */ + int (*xFreeGC) (Display *display, GC gc); /* 84 */ Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 85 */ - void (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 86 */ - void (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 87 */ - void (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 88 */ - void (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 89 */ - void (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 90 */ - void (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 91 */ - void (*xSetFont) (Display *display, GC gc, Font font); /* 92 */ - void (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 93 */ - void (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 94 */ - void (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 95 */ - void (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 96 */ - void (*xSetFunction) (Display *display, GC gc, int function); /* 97 */ - void (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 98 */ + int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 86 */ + int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 87 */ + int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 88 */ + int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 89 */ + int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 90 */ + int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 91 */ + int (*xSetFont) (Display *display, GC gc, Font font); /* 92 */ + int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 93 */ + int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 94 */ + int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 95 */ + int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 96 */ + int (*xSetFunction) (Display *display, GC gc, int function); /* 97 */ + int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 98 */ int (*_XInitImageFuncPtrs) (XImage *image); /* 99 */ - XIC (*xCreateIC) (void); /* 100 */ + XIC (*xCreateIC) (XIM xim, ...); /* 100 */ XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 101 */ void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 102 */ Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 103 */ - void (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */ - void (*xWarpPointer) (Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */ - void (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */ + int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */ + int (*xWarpPointer) (Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */ + int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 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 */ + int (*xSync) (Display *display, Bool discard); /* 113 */ + VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ - void (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */ + 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 */ @@ -1316,24 +1371,24 @@ typedef struct TkIntXlibStubs { Window (*xRootWindow) (Display *d, int i); /* 10 */ XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */ Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */ - void (*xBell) (Display *d, int i); /* 13 */ + int (*xBell) (Display *d, int i); /* 13 */ void (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */ void (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */ void (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */ void (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */ void (*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 */ - void (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */ + int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */ void (*xDestroyWindow) (Display *d, Window w); /* 21 */ void (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */ - void (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */ + int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */ void (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */ void (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */ void (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */ - void (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */ - void (*xFreeColormap) (Display *d, Colormap c); /* 28 */ - void (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */ - void (*xFreeModifiermap) (XModifierKeymap *x); /* 30 */ + 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 */ @@ -1350,7 +1405,7 @@ typedef struct TkIntXlibStubs { Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */ void (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */ void (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */ - void (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */ + int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */ void (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */ void (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */ void (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */ @@ -1358,26 +1413,26 @@ typedef struct TkIntXlibStubs { void (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */ void (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */ void (*xUngrabKeyboard) (Display *d, Time t); /* 54 */ - void (*xUngrabPointer) (Display *d, Time t); /* 55 */ + int (*xUngrabPointer) (Display *d, Time t); /* 55 */ void (*xUnmapWindow) (Display *d, Window w); /* 56 */ - void (*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 */ + 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 */ - void (*xFreeGC) (Display *display, GC gc); /* 60 */ + int (*xFreeGC) (Display *display, GC gc); /* 60 */ Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 61 */ - void (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 62 */ - void (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 63 */ - void (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 64 */ - void (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 65 */ - void (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 66 */ - void (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 67 */ - void (*xSetFont) (Display *display, GC gc, Font font); /* 68 */ - void (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 69 */ - void (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 70 */ - void (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 71 */ - void (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 72 */ - void (*xSetFunction) (Display *display, GC gc, int function); /* 73 */ - void (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */ + 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) (void); /* 76 */ XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */ @@ -1385,12 +1440,12 @@ typedef struct TkIntXlibStubs { Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */ void (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */ void (*xForceScreenSaver) (Display *display, int mode); /* 81 */ - void (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */ - void (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */ + 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 */ void (*xClearWindow) (Display *d, Window w); /* 84 */ void (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */ void (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */ - void (*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 (*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 */ void (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */ void (*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 */ @@ -1412,7 +1467,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; * Inline function declarations: */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #ifndef XSetDashes #define XSetDashes \ (tkIntXlibStubsPtr->xSetDashes) /* 0 */ @@ -1838,6 +1893,38 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #define XFillRectangle \ (tkIntXlibStubsPtr->xFillRectangle) /* 106 */ #endif +#ifndef XFlush +#define XFlush \ + (tkIntXlibStubsPtr->xFlush) /* 107 */ +#endif +#ifndef XGrabServer +#define XGrabServer \ + (tkIntXlibStubsPtr->xGrabServer) /* 108 */ +#endif +#ifndef XUngrabServer +#define XUngrabServer \ + (tkIntXlibStubsPtr->xUngrabServer) /* 109 */ +#endif +#ifndef XFree +#define XFree \ + (tkIntXlibStubsPtr->xFree) /* 110 */ +#endif +#ifndef XNoOp +#define XNoOp \ + (tkIntXlibStubsPtr->xNoOp) /* 111 */ +#endif +#ifndef XSynchronize +#define XSynchronize \ + (tkIntXlibStubsPtr->xSynchronize) /* 112 */ +#endif +#ifndef XSync +#define XSync \ + (tkIntXlibStubsPtr->xSync) /* 113 */ +#endif +#ifndef XVisualIDFromVisual +#define XVisualIDFromVisual \ + (tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */ +#endif #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ #ifndef XSetDashes @@ -2217,4 +2304,65 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +#if defined(__WIN32__) + +#undef XFlush +#undef XGrabServer +#undef XUngrabServer +#undef XFree +#undef XNoOp +#undef XSynchronize +#undef XSync +#undef XVisualIDFromVisual + +#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) +/* + * The following stubs implement various calls that don't do anything + * under Windows. In win32 tclsh 8.4 and 8.5 holds: + * tkIntStubsPtr->tkBindDeadWindow != NULL + * Then the following macros don't do anything. But when running Tcl win32 + * version 8.6 or Cygwin (8.4, 8.5 or 8.6) then the functions are available in + * the stub table. The real function from the stub table will be called, + * even though it might be doing nothing. + */ + +#define XFlush(display) (tkIntStubsPtr->tkBindDeadWindow? 0: tkIntXlibStubsPtr->xFlush(display)) +#define XGrabServer(display) (tkIntStubsPtr->tkBindDeadWindow? 0: tkIntXlibStubsPtr->xGrabServer(display)) +#define XUngrabServer(display) (tkIntStubsPtr->tkBindDeadWindow? 0: tkIntXlibStubsPtr->xUngrabServer(display)) + +/* + * The following functions are implemented as macros under Windows. + */ + + +#define XFree(data) (tkIntStubsPtr->tkBindDeadWindow? ((data)? (ckfree((char *) (data)), 0): 0): tkIntXlibStubsPtr->xFree(data)) +#define XNoOp(display) (tkIntStubsPtr->tkBindDeadWindow? 0: tkIntXlibStubsPtr->xNoOp(display)) +#define XSynchronize(display, bool) (tkIntStubsPtr->tkBindDeadWindow? 0: tkIntXlibStubsPtr->xSynchronize(display, bool)) +#define XSync(display, bool) (tkIntStubsPtr->tkBindDeadWindow? 0: tkIntXlibStubsPtr->xSync(display, bool)) +#define XVisualIDFromVisual(visual) (tkIntStubsPtr->tkBindDeadWindow? ((visual)->visualid): tkIntXlibStubsPtr->xVisualIDFromVisual(visual)) + +#else /* !USE_TK_STUBS */ +/* + * The following stubs implement various calls that don't do anything + * under Windows. + */ + +#define XFlush(display) +#define XGrabServer(display) +#define XUngrabServer(display) + +/* + * The following functions are implemented as macros under Windows. + */ + +#define XFree(data) {if ((data) != NULL) ckfree((char *) (data));} +#define XNoOp(display) {display->request++;} +#define XSynchronize(display, bool) {display->request++;} +#define XSync(display, bool) {display->request++;} +#define XVisualIDFromVisual(visual) (visual->visualid) + +#endif /* !USE_TK_STUBS */ + +#endif /* __WIN32__ */ + #endif /* _TKINTXLIBDECLS */ diff --git a/mingw/include/tkPlatDecls.h b/mingw/include/tkPlatDecls.h index 5b386ee3..549ae30a 100644 --- a/mingw/include/tkPlatDecls.h +++ b/mingw/include/tkPlatDecls.h @@ -29,7 +29,7 @@ * Exported function declarations: */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #ifndef Tk_AttachHWND_TCL_DECLARED #define Tk_AttachHWND_TCL_DECLARED /* 0 */ @@ -108,12 +108,12 @@ EXTERN void TkMacOSXInvalClipRgns(Tk_Window tkwin); #ifndef TkMacOSXGetDrawablePort_TCL_DECLARED #define TkMacOSXGetDrawablePort_TCL_DECLARED /* 7 */ -EXTERN GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable); +EXTERN VOID * TkMacOSXGetDrawablePort(Drawable drawable); #endif #ifndef TkMacOSXGetRootControl_TCL_DECLARED #define TkMacOSXGetRootControl_TCL_DECLARED /* 8 */ -EXTERN ControlRef TkMacOSXGetRootControl(Drawable drawable); +EXTERN VOID * TkMacOSXGetRootControl(Drawable drawable); #endif #ifndef Tk_MacOSXSetupTkNotifier_TCL_DECLARED #define Tk_MacOSXSetupTkNotifier_TCL_DECLARED @@ -131,7 +131,7 @@ typedef struct TkPlatStubs { int magic; struct TkPlatStubHooks *hooks; -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */ HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */ HWND (*tk_GetHWND) (Window window); /* 2 */ @@ -147,8 +147,8 @@ typedef struct TkPlatStubs { void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */ void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */ void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */ - GWorldPtr (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */ - ControlRef (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */ + VOID * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */ + VOID * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */ void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */ int (*tk_MacOSXIsAppInFront) (void); /* 10 */ #endif /* AQUA */ @@ -168,7 +168,7 @@ extern TkPlatStubs *tkPlatStubsPtr; * Inline function declarations: */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #ifndef Tk_AttachHWND #define Tk_AttachHWND \ (tkPlatStubsPtr->tk_AttachHWND) /* 0 */ diff --git a/mingw/lib/libtk85.a b/mingw/lib/libtk85.a new file mode 100644 index 00000000..2c02133b Binary files /dev/null and b/mingw/lib/libtk85.a differ diff --git a/mingw/lib/libtkstub85.a b/mingw/lib/libtkstub85.a new file mode 100644 index 00000000..833d2ee1 Binary files /dev/null and b/mingw/lib/libtkstub85.a differ diff --git a/mingw/lib/tk8.5/bgerror.tcl b/mingw/lib/tk8.5/bgerror.tcl index a9e7d303..f46ab4c6 100644 --- a/mingw/lib/tk8.5/bgerror.tcl +++ b/mingw/lib/tk8.5/bgerror.tcl @@ -214,14 +214,16 @@ proc ::tk::dialog::error::bgerror err { bind $dlg [namespace code [list Destroy %W]] $dlg.function configure -command [namespace code Details] - # 6. Place the window (centered in the display) and deiconify it. + # 6. Withdraw the window, then update all the geometry information + # so we know how big it wants to be, then center the window in the + # display (Motif style) and de-iconify it. ::tk::PlaceWindow $dlg # 7. Ensure that we are topmost. raise $dlg - if {$tcl_platform(platform) eq "windows"} { + if {[tk windowingsystem] eq "win32"} { # Place it topmost if we aren't at the top of the stacking # order to ensure that it's seen if {[lindex [wm stackorder .] end] ne "$dlg"} { diff --git a/mingw/lib/tk8.5/button.tcl b/mingw/lib/tk8.5/button.tcl index b817b76e..d095b8ab 100644 --- a/mingw/lib/tk8.5/button.tcl +++ b/mingw/lib/tk8.5/button.tcl @@ -39,7 +39,7 @@ if {[tk windowingsystem] eq "aqua"} { tk::ButtonLeave %W } } -if {"windows" eq $tcl_platform(platform)} { +if {"win32" eq [tk windowingsystem]} { bind Checkbutton { tk::CheckRadioInvoke %W select } @@ -131,7 +131,7 @@ bind Radiobutton { tk::ButtonLeave %W } -if {"windows" eq $tcl_platform(platform)} { +if {"win32" eq [tk windowingsystem]} { ######################### # Windows implementation diff --git a/mingw/lib/tk8.5/choosedir.tcl b/mingw/lib/tk8.5/choosedir.tcl index 8f3f75f9..00dca9d8 100644 --- a/mingw/lib/tk8.5/choosedir.tcl +++ b/mingw/lib/tk8.5/choosedir.tcl @@ -89,7 +89,7 @@ proc ::tk::dialog::file::chooseDir:: {args} { # Withdraw the window, then update all the geometry information # so we know how big it wants to be, then center the window in the - # display and de-iconify it. + # display (Motif style) and de-iconify it. ::tk::PlaceWindow $w widget $data(-parent) wm title $w $data(-title) diff --git a/mingw/lib/tk8.5/clrpick.tcl b/mingw/lib/tk8.5/clrpick.tcl index 712c45d6..092915c6 100644 --- a/mingw/lib/tk8.5/clrpick.tcl +++ b/mingw/lib/tk8.5/clrpick.tcl @@ -89,7 +89,7 @@ proc ::tk::dialog::color:: {args} { # 5. Withdraw the window, then update all the geometry information # so we know how big it wants to be, then center the window in the - # display and de-iconify it. + # display (Motif style) and de-iconify it. ::tk::PlaceWindow $w widget $data(-parent) wm title $w $data(-title) diff --git a/mingw/lib/tk8.5/demos/browse b/mingw/lib/tk8.5/demos/browse index d107f285..dfdc5a40 100644 --- a/mingw/lib/tk8.5/demos/browse +++ b/mingw/lib/tk8.5/demos/browse @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" ${1+"$@"} +exec wish85 "$0" ${1+"$@"} # browse -- # This script generates a directory browser, which lists the working diff --git a/mingw/lib/tk8.5/demos/hello b/mingw/lib/tk8.5/demos/hello index c8ccd377..e2dbb1da 100644 --- a/mingw/lib/tk8.5/demos/hello +++ b/mingw/lib/tk8.5/demos/hello @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish85 "$0" ${1+"$@"} # hello -- # Simple Tk script to create a button that prints "Hello, world". diff --git a/mingw/lib/tk8.5/demos/ixset b/mingw/lib/tk8.5/demos/ixset index 06b644df..f9c46eb4 100644 --- a/mingw/lib/tk8.5/demos/ixset +++ b/mingw/lib/tk8.5/demos/ixset @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" ${1+"$@"} +exec wish85 "$0" ${1+"$@"} # ixset -- # A nice interface to "xset" to change X server settings diff --git a/mingw/lib/tk8.5/demos/license.terms b/mingw/lib/tk8.5/demos/license.terms index 50619a32..fc7b2c03 100644 --- a/mingw/lib/tk8.5/demos/license.terms +++ b/mingw/lib/tk8.5/demos/license.terms @@ -28,7 +28,7 @@ MODIFICATIONS. GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" -in the software and related documentation as defined in the Federal +in the software and related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the diff --git a/mingw/lib/tk8.5/demos/mclist.tcl b/mingw/lib/tk8.5/demos/mclist.tcl index d1d3f471..21dcf292 100644 --- a/mingw/lib/tk8.5/demos/mclist.tcl +++ b/mingw/lib/tk8.5/demos/mclist.tcl @@ -77,6 +77,16 @@ foreach {country capital currency} $data { ## Code to do the sorting of the tree contents when clicked on proc SortBy {tree col direction} { + # Determine currently sorted column and its sort direction + foreach c {country capital currency} { + set s [$tree heading $c state] + if {("selected" in $s || "alternate" in $s) && $col ne $c} { + # Sorted column has changed + $tree heading $c state {!selected !alternate !user1} + set direction [expr {"alternate" in $s}] + } + } + # Build something we can sort set data {} foreach row [$tree children {}] { @@ -92,5 +102,10 @@ proc SortBy {tree col direction} { } # Switch the heading so that it will sort in the opposite direction - $tree heading $col -command [list SortBy $tree $col [expr {!$direction}]] + $tree heading $col -command [list SortBy $tree $col [expr {!$direction}]] \ + state [expr {$direction?"!selected alternate":"selected !alternate"}] + if {[tk windowingsystem] eq "aqua"} { + # Aqua theme displays native sort arrows when user1 state is set + $tree heading $col state "user1" + } } diff --git a/mingw/lib/tk8.5/demos/menu.tcl b/mingw/lib/tk8.5/demos/menu.tcl index ebd44f75..e19df571 100644 --- a/mingw/lib/tk8.5/demos/menu.tcl +++ b/mingw/lib/tk8.5/demos/menu.tcl @@ -56,7 +56,7 @@ menu $m -tearoff 0 $m add command -label "Long entry that does nothing" if {[tk windowingsystem] eq "aqua"} { set modifier Command -} elseif {$tcl_platform(platform) == "windows"} { +} elseif {[tk windowingsystem] == "win32"} { set modifier Control } else { set modifier Meta diff --git a/mingw/lib/tk8.5/demos/rmt b/mingw/lib/tk8.5/demos/rmt index 1be4b566..dcdbe493 100644 --- a/mingw/lib/tk8.5/demos/rmt +++ b/mingw/lib/tk8.5/demos/rmt @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish85 "$0" ${1+"$@"} # rmt -- # This script implements a simple remote-control mechanism for diff --git a/mingw/lib/tk8.5/demos/rolodex b/mingw/lib/tk8.5/demos/rolodex index 89415708..d9c2ad03 100644 --- a/mingw/lib/tk8.5/demos/rolodex +++ b/mingw/lib/tk8.5/demos/rolodex @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" ${1+"$@"} +exec wish85 "$0" ${1+"$@"} # rolodex -- # This script was written as an entry in Tom LaStrange's rolodex diff --git a/mingw/lib/tk8.5/demos/square b/mingw/lib/tk8.5/demos/square deleted file mode 100644 index b7dd78fa..00000000 --- a/mingw/lib/tk8.5/demos/square +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# the next line restarts using wish \ -exec wish "$0" "$@" - -# square -- -# This script generates a demo application containing only a "square" -# widget. It's only usable in the "tktest" application or if Tk has -# been compiled with tkSquare.c. This demo arranges the following -# bindings for the widget: -# -# Button-1 press/drag: moves square to mouse -# "a": toggle size animation on/off - -package require Tk ;# We use Tk generally, and... -package require Tktest ;# ... we use the square widget too. - -square .s -pack .s -expand yes -fill both -wm minsize . 1 1 - -bind .s <1> {center %x %y} -bind .s {center %x %y} -bind .s a animate -focus .s - -# The procedure below centers the square on a given position. - -proc center {x y} { - set a [.s size] - .s position [expr $x-($a/2)] [expr $y-($a/2)] -} - -# The procedures below provide a simple form of animation where -# the box changes size in a pulsing pattern: larger, smaller, larger, -# and so on. - -set inc 0 -proc animate {} { - global inc - if {$inc == 0} { - set inc 3 - timer - } else { - set inc 0 - } -} - -proc timer {} { - global inc - set s [.s size] - if {$inc == 0} return - if {$s >= 40} {set inc -3} - if {$s <= 10} {set inc 3} - .s size [expr {$s+$inc}] - after 30 timer -} - -# Local Variables: -# mode: tcl -# End: diff --git a/mingw/lib/tk8.5/demos/tcolor b/mingw/lib/tk8.5/demos/tcolor index bd20f7b6..9f0af955 100644 --- a/mingw/lib/tk8.5/demos/tcolor +++ b/mingw/lib/tk8.5/demos/tcolor @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish85 "$0" ${1+"$@"} # tcolor -- # This script implements a simple color editor, where you can diff --git a/mingw/lib/tk8.5/demos/text.tcl b/mingw/lib/tk8.5/demos/text.tcl index 21ee096c..1b5f3b9d 100644 --- a/mingw/lib/tk8.5/demos/text.tcl +++ b/mingw/lib/tk8.5/demos/text.tcl @@ -67,11 +67,11 @@ cursor. Control-t transposes the two characters on either side of the insertion cursor. Control-z undoes the last editing action performed, and } -switch $tcl_platform(platform) { - "unix" { +switch [tk windowingsystem] { + "aqua" - "x11" { $w.text insert end "Control-Shift-z" } - "windows" { + "win32" { $w.text insert end "Control-y" } } diff --git a/mingw/lib/tk8.5/demos/timer b/mingw/lib/tk8.5/demos/timer index 694227f5..82ae9351 100644 --- a/mingw/lib/tk8.5/demos/timer +++ b/mingw/lib/tk8.5/demos/timer @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish85 "$0" ${1+"$@"} # timer -- # This script generates a counter with start and stop buttons. diff --git a/mingw/lib/tk8.5/demos/toolbar.tcl b/mingw/lib/tk8.5/demos/toolbar.tcl index 541e8bab..0ae46695 100644 --- a/mingw/lib/tk8.5/demos/toolbar.tcl +++ b/mingw/lib/tk8.5/demos/toolbar.tcl @@ -7,7 +7,6 @@ if {![info exists widgetDemo]} { } package require Tk -package require Ttk set w .toolbar destroy $w @@ -16,57 +15,46 @@ wm title $w "Toolbar Demonstration" wm iconname $w "toolbar" positionWindow $w -if {[tk windowingsystem] ne "aqua"} { - ttk::label $w.msg -wraplength 4i -text "This is a demonstration of how to do\ - a toolbar that is styled correctly and which can be torn off. The\ - buttons are configured to be \u201Ctoolbar style\u201D buttons by\ - telling them that they are to use the Toolbutton style. At the left\ - end of the toolbar is a simple marker that the cursor changes to a\ - movement icon over; drag that away from the toolbar to tear off the\ - whole toolbar into a separate toplevel widget. When the dragged-off\ - toolbar is no longer needed, just close it like any normal toplevel\ - and it will reattach to the window it was torn off from." -} else { ttk::label $w.msg -wraplength 4i -text "This is a demonstration of how to do\ - a toolbar that is styled correctly. The buttons are configured to\ - be \u201Ctoolbar style\u201D buttons by telling them that they are\ - to use the Toolbutton style." -} + a toolbar that is styled correctly and which can be torn off. The\ + buttons are configured to be \u201Ctoolbar style\u201D buttons by\ + telling them that they are to use the Toolbutton style. At the left\ + end of the toolbar is a simple marker that the cursor changes to a\ + movement icon over; drag that away from the toolbar to tear off the\ + whole toolbar into a separate toplevel widget. When the dragged-off\ + toolbar is no longer needed, just close it like any normal toplevel\ + and it will reattach to the window it was torn off from." ## Set up the toolbar hull set t [frame $w.toolbar] ;# Must be a frame! ttk::separator $w.sep ttk::frame $t.tearoff -cursor fleur -if {[tk windowingsystem] ne "aqua"} { - ttk::separator $t.tearoff.to -orient vertical - ttk::separator $t.tearoff.to2 -orient vertical - pack $t.tearoff.to -fill y -expand 1 -padx 2 -side left - pack $t.tearoff.to2 -fill y -expand 1 -side left -} +ttk::separator $t.tearoff.to -orient vertical +ttk::separator $t.tearoff.to2 -orient vertical +pack $t.tearoff.to -fill y -expand 1 -padx 2 -side left +pack $t.tearoff.to2 -fill y -expand 1 -side left ttk::frame $t.contents grid $t.tearoff $t.contents -sticky nsew grid columnconfigure $t $t.contents -weight 1 grid columnconfigure $t.contents 1000 -weight 1 -if {[tk windowingsystem] ne "aqua"} { - ## Bindings so that the toolbar can be torn off and reattached - bind $t.tearoff [list tearoff $t %X %Y] - bind $t.tearoff.to [list tearoff $t %X %Y] - bind $t.tearoff.to2 [list tearoff $t %X %Y] - proc tearoff {w x y} { - if {[string match $w* [winfo containing $x $y]]} { - return - } - grid remove $w - grid remove $w.tearoff - wm manage $w - wm protocol $w WM_DELETE_WINDOW [list untearoff $w] - } - proc untearoff {w} { - wm forget $w - grid $w.tearoff - grid $w +## Bindings so that the toolbar can be torn off and reattached +bind $t.tearoff [list tearoff $t %X %Y] +bind $t.tearoff.to [list tearoff $t %X %Y] +bind $t.tearoff.to2 [list tearoff $t %X %Y] +proc tearoff {w x y} { + if {[string match $w* [winfo containing $x $y]]} { + return } + grid remove $w + grid remove $w.tearoff + wm manage $w + wm protocol $w WM_DELETE_WINDOW [list untearoff $w] +} +proc untearoff {w} { + wm forget $w + grid $w.tearoff + grid $w } ## Toolbar contents diff --git a/mingw/lib/tk8.5/demos/widget b/mingw/lib/tk8.5/demos/widget index 7dd8ab3a..1be668df 100644 --- a/mingw/lib/tk8.5/demos/widget +++ b/mingw/lib/tk8.5/demos/widget @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish85 "$0" ${1+"$@"} # widget -- # This script demonstrates the various widgets provided by Tk, along with many diff --git a/mingw/lib/tk8.5/dialog.tcl b/mingw/lib/tk8.5/dialog.tcl index abe142bf..26ec7e0a 100644 --- a/mingw/lib/tk8.5/dialog.tcl +++ b/mingw/lib/tk8.5/dialog.tcl @@ -146,27 +146,9 @@ proc ::tk_dialog {w title text bitmap default args} { # 6. Withdraw the window, then update all the geometry information # so we know how big it wants to be, then center the window in the - # display and de-iconify it. - - wm withdraw $w - update idletasks - set x [expr {[winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \ - - [winfo vrootx [winfo parent $w]]}] - set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \ - - [winfo vrooty [winfo parent $w]]}] - # Make sure that the window is on the screen and set the maximum - # size of the window is the size of the screen. That'll let things - # fail fairly gracefully when very large messages are used. [Bug 827535] - if {$x < 0} { - set x 0 - } - if {$y < 0} { - set y 0 - } - wm maxsize $w [winfo screenwidth $w] [winfo screenheight $w] - wm geometry $w +$x+$y - wm deiconify $w + # display (Motif style) and de-iconify it. + ::tk::PlaceWindow $w tkwait visibility $w # 7. Set a grab and claim the focus too. diff --git a/mingw/lib/tk8.5/entry.tcl b/mingw/lib/tk8.5/entry.tcl index 54f2136b..382cc882 100644 --- a/mingw/lib/tk8.5/entry.tcl +++ b/mingw/lib/tk8.5/entry.tcl @@ -214,7 +214,7 @@ if {[tk windowingsystem] eq "aqua"} { # On Windows, paste is done using Shift-Insert. Shift-Insert already # generates the <> event, so we don't need to do anything here. -if {$tcl_platform(platform) ne "windows"} { +if {[tk windowingsystem] ne "win32"} { bind Entry { catch {tk::EntryInsert %W [::tk::GetSelection %W PRIMARY]} } @@ -574,7 +574,7 @@ proc ::tk::EntryTranspose w { # w - The entry window in which the cursor is to move. # start - Position at which to start search. -if {$tcl_platform(platform) eq "windows"} { +if {[tk windowingsystem] eq "win32"} { proc ::tk::EntryNextWord {w start} { set pos [tcl_endOfWord [$w get] [$w index $start]] if {$pos >= 0} { diff --git a/mingw/lib/tk8.5/menu.tcl b/mingw/lib/tk8.5/menu.tcl index e00dad9f..cc57532e 100644 --- a/mingw/lib/tk8.5/menu.tcl +++ b/mingw/lib/tk8.5/menu.tcl @@ -60,7 +60,7 @@ # This file is tricky because there are five different ways that menus # can be used: # -# 1. As a pulldown from a menubutton. In this style, the variable +# 1. As a pulldown from a menubutton. In this style, the variable # tk::Priv(postedMb) identifies the posted menubutton. # 2. As a torn-off menu copied from some other menu. In this style # tk::Priv(postedMb) is empty, and menu's type is "tearoff". @@ -282,81 +282,81 @@ proc ::tk::MbPost {w {x {}} {y {}}} { update idletasks if {[catch { switch [$w cget -direction] { - above { - set x [winfo rootx $w] - set y [expr {[winfo rooty $w] - [winfo reqheight $menu]}] + above { + set x [winfo rootx $w] + set y [expr {[winfo rooty $w] - [winfo reqheight $menu]}] # if we go offscreen to the top, show as 'below' - if {$y < 0} { - set y [expr {[winfo rooty $w] + [winfo height $w]}] + if {$y < [winfo vrooty $w]} { + set y [expr {[winfo vrooty $w] + [winfo rooty $w] + [winfo reqheight $w]}] } PostOverPoint $menu $x $y - } - below { - set x [winfo rootx $w] - set y [expr {[winfo rooty $w] + [winfo height $w]}] + } + below { + set x [winfo rootx $w] + set y [expr {[winfo rooty $w] + [winfo height $w]}] # if we go offscreen to the bottom, show as 'above' set mh [winfo reqheight $menu] - if {($y + $mh) > [winfo screenheight $w]} { - set y [expr {[winfo rooty $w] - $mh}] + if {($y + $mh) > ([winfo vrooty $w] + [winfo vrootheight $w])} { + set y [expr {[winfo vrooty $w] + [winfo vrootheight $w] + [winfo rooty $w] - $mh}] } PostOverPoint $menu $x $y - } - left { - set x [expr {[winfo rootx $w] - [winfo reqwidth $menu]}] - set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}] - set entry [MenuFindName $menu [$w cget -text]] - if {[$w cget -indicatoron] && $entry ne ""} { + } + left { + set x [expr {[winfo rootx $w] - [winfo reqwidth $menu]}] + set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}] + set entry [MenuFindName $menu [$w cget -text]] + if {[$w cget -indicatoron]} { if {$entry == [$menu index last]} { - incr y [expr {-([$menu yposition $entry] \ - + [winfo reqheight $menu])/2}] + incr y [expr {-([$menu yposition $entry] \ + + [winfo reqheight $menu])/2}] } else { - incr y [expr {-([$menu yposition $entry] \ + incr y [expr {-([$menu yposition $entry] \ + [$menu yposition [expr {$entry+1}]])/2}] } - } + } PostOverPoint $menu $x $y if {$entry ne "" \ && [$menu entrycget $entry -state] ne "disabled"} { - $menu activate $entry + $menu activate $entry GenerateMenuSelect $menu - } - } - right { - set x [expr {[winfo rootx $w] + [winfo width $w]}] - set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}] - set entry [MenuFindName $menu [$w cget -text]] - if {[$w cget -indicatoron] && $entry ne ""} { + } + } + right { + set x [expr {[winfo rootx $w] + [winfo width $w]}] + set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}] + set entry [MenuFindName $menu [$w cget -text]] + if {[$w cget -indicatoron]} { if {$entry == [$menu index last]} { - incr y [expr {-([$menu yposition $entry] \ - + [winfo reqheight $menu])/2}] + incr y [expr {-([$menu yposition $entry] \ + + [winfo reqheight $menu])/2}] } else { - incr y [expr {-([$menu yposition $entry] \ + incr y [expr {-([$menu yposition $entry] \ + [$menu yposition [expr {$entry+1}]])/2}] } - } + } PostOverPoint $menu $x $y if {$entry ne "" \ && [$menu entrycget $entry -state] ne "disabled"} { - $menu activate $entry + $menu activate $entry GenerateMenuSelect $menu - } - } - default { - if {[$w cget -indicatoron]} { + } + } + default { + if {[$w cget -indicatoron]} { if {$y eq ""} { set x [expr {[winfo rootx $w] + [winfo width $w]/2}] set y [expr {[winfo rooty $w] + [winfo height $w]/2}] - } + } PostOverPoint $menu $x $y [MenuFindName $menu [$w cget -text]] } else { PostOverPoint $menu [winfo rootx $w] [expr {[winfo rooty $w]+[winfo height $w]}] - } - } + } + } } } msg]} { # Error posting menu (e.g. bogus -postcommand). Unpost it and # reflect the error. - + set savedInfo $errorInfo MenuUnpost {} error $msg $savedInfo @@ -365,7 +365,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { set Priv(tearoff) $tearoff if {$tearoff != 0} { - focus $menu + focus $menu if {[winfo viewable $w]} { SaveGrabInfo $w grab -global $w @@ -425,8 +425,7 @@ proc ::tk::MenuUnpost menu { } elseif {$Priv(popup) ne ""} { $Priv(popup) unpost set Priv(popup) {} - } elseif {[$menu cget -type] ne "menubar" \ - && [$menu cget -type] ne "tearoff"} { + } elseif {[$menu cget -type] ne "menubar" && [$menu cget -type] ne "tearoff"} { # We're in a cascaded sub-menu from a torn-off menu or popup. # Unpost all the menus up to the toplevel one (but not # including the top-level torn-off one) and deactivate the @@ -434,8 +433,7 @@ proc ::tk::MenuUnpost menu { while {1} { set parent [winfo parent $menu] - if {[winfo class $parent] ne "Menu" \ - || ![winfo ismapped $parent]} { + if {[winfo class $parent] ne "Menu" || ![winfo ismapped $parent]} { break } $parent activate none @@ -454,8 +452,8 @@ proc ::tk::MenuUnpost menu { } if {($Priv(tearoff) != 0) || $Priv(menuBar) ne ""} { - # Release grab, if any, and restore the previous grab, if there - # was one. + # Release grab, if any, and restore the previous grab, if there + # was one. if {$menu ne ""} { set grab [grab current $menu] if {$grab ne ""} { @@ -702,7 +700,7 @@ proc ::tk::MenuInvoke {w buttonRelease} { set isCascade [string equal [$w type $active] "cascade"] # Only de-activate the active item if it's a cascade; this prevents - # the annoying "activation flicker" you otherwise get with + # the annoying "activation flicker" you otherwise get with # checkbuttons/commands/etc. on menubars if { $isCascade } { @@ -1030,11 +1028,10 @@ proc ::tk::TraverseToMenu {w char} { return } while {[winfo class $w] eq "Menu"} { - if {[$w cget -type] ne "menubar" && $Priv(postedMb) eq ""} { - return - } if {[$w cget -type] eq "menubar"} { break + } elseif {$Priv(postedMb) eq ""} { + return } set w [winfo parent $w] } @@ -1153,8 +1150,7 @@ proc ::tk::MenuFirstEntry menu { # otherwise, if the first entry of the cascade is a cascade, # we can get an annoying cascading effect resulting in a bunch of # menus getting posted (bug 676) - if {[$menu type $i] eq "cascade" \ - && [$menu cget -type] eq "menubar"} { + if {[$menu type $i] eq "cascade" && [$menu cget -type] eq "menubar"} { set cascade [$menu entrycget $i -menu] if {$cascade ne ""} { $menu postcascade $i @@ -1211,7 +1207,7 @@ proc ::tk::MenuFindName {menu s} { proc ::tk::PostOverPoint {menu x y {entry {}}} { global tcl_platform - + if {$entry ne ""} { if {$entry == [$menu index last]} { incr y [expr {-([$menu yposition $entry] \ @@ -1223,7 +1219,7 @@ proc ::tk::PostOverPoint {menu x y {entry {}}} { incr x [expr {-[winfo reqwidth $menu]/2}] } - if {$tcl_platform(platform) eq "windows"} { + if {[tk windowingsystem] eq "win32"} { # osVersion is not available in safe interps set ver 5 if {[info exists tcl_platform(osVersion)]} { @@ -1235,21 +1231,20 @@ proc ::tk::PostOverPoint {menu x y {entry {}}} { # Windows puts it in the wrong place for us. We must also # subtract an extra amount for half the height of the current # entry. To be safe we subtract an extra 10. - # NOTE: this issue appears to have been resolved in the Window - # manager provided with Vista and Windows 7. + # NOTE: this issue appears to have been resolved in the Window + # manager provided with Vista and Windows 7. if {$ver < 6} { set yoffset [expr {[winfo screenheight $menu] \ - - $y - [winfo reqheight $menu] - 10}] - if {$yoffset < 0} { + - $y - [winfo reqheight $menu] - 10}] + if {$yoffset < [winfo vrooty $menu]} { # The bottom of the menu is offscreen, so adjust upwards - incr y $yoffset - if {$y < 0} { set y 0 } + incr y [expr {$yoffset - [winfo vrooty $menu]}] } # If we're off the top of the screen (either because we were # originally or because we just adjusted too far upwards), # then make the menu popup on the top edge. - if {$y < 0} { - set y 0 + if {$y < [winfo vrooty $menu]} { + set y [winfo vrooty $menu] } } } @@ -1284,7 +1279,7 @@ proc ::tk::RestoreOldGrab {} { variable ::tk::Priv if {$Priv(oldGrab) ne ""} { - # Be careful restoring the old grab, since it's window may not + # Be careful restoring the old grab, since it's window may not # be visible anymore. catch { @@ -1305,7 +1300,7 @@ proc ::tk_menuSetFocus {menu} { } focus $menu } - + proc ::tk::GenerateMenuSelect {menu} { variable ::tk::Priv diff --git a/mingw/lib/tk8.5/msgbox.tcl b/mingw/lib/tk8.5/msgbox.tcl index ed1f4fe7..572510ad 100644 --- a/mingw/lib/tk8.5/msgbox.tcl +++ b/mingw/lib/tk8.5/msgbox.tcl @@ -421,7 +421,7 @@ proc ::tk::MessageBox {args} { # 7. Withdraw the window, then update all the geometry information # so we know how big it wants to be, then center the window in the - # display and de-iconify it. + # display (Motif style) and de-iconify it. ::tk::PlaceWindow $w widget $data(-parent) diff --git a/mingw/lib/tk8.5/pkgIndex.tcl b/mingw/lib/tk8.5/pkgIndex.tcl index 72485aa9..11bf761e 100644 --- a/mingw/lib/tk8.5/pkgIndex.tcl +++ b/mingw/lib/tk8.5/pkgIndex.tcl @@ -1,2 +1,7 @@ -if {[catch {package present Tcl 8.5.0}]} { return } -package ifneeded Tk 8.5.11 [list load [file join $dir .. .. bin tk85.dll] Tk] +if {[catch {package present Tcl 8.5.0}]} return +if {($::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)] + || ([info exists ::argv] && ("-display" in $::argv)))} { + package ifneeded Tk 8.5.13 [list load [file join $dir .. .. bin libtk8.5.dll] Tk] +} else { + package ifneeded Tk 8.5.13 [list load [file join $dir .. .. bin tk85.dll] Tk] +} diff --git a/mingw/lib/tk8.5/scale.tcl b/mingw/lib/tk8.5/scale.tcl index d362284c..b4da8249 100644 --- a/mingw/lib/tk8.5/scale.tcl +++ b/mingw/lib/tk8.5/scale.tcl @@ -60,7 +60,7 @@ bind Scale { tk::ScaleEndDrag %W tk::ScaleActivate %W %x %y } -if {$tcl_platform(platform) eq "windows"} { +if {[tk windowingsystem] eq "win32"} { # On Windows do the same with button 3, as that is the right mouse button bind Scale <3> [bind Scale <2>] bind Scale [bind Scale ] diff --git a/mingw/lib/tk8.5/spinbox.tcl b/mingw/lib/tk8.5/spinbox.tcl index c05ccece..cb501eee 100644 --- a/mingw/lib/tk8.5/spinbox.tcl +++ b/mingw/lib/tk8.5/spinbox.tcl @@ -221,7 +221,7 @@ if {[tk windowingsystem] eq "aqua"} { # On Windows, paste is done using Shift-Insert. Shift-Insert already # generates the <> event, so we don't need to do anything here. -if {$tcl_platform(platform) ne "windows"} { +if {[tk windowingsystem] ne "win32"} { bind Spinbox { catch {::tk::EntryInsert %W [::tk::GetSelection %W PRIMARY]} } diff --git a/mingw/lib/tk8.5/text.tcl b/mingw/lib/tk8.5/text.tcl index d4ff18ea..0e43e618 100644 --- a/mingw/lib/tk8.5/text.tcl +++ b/mingw/lib/tk8.5/text.tcl @@ -539,7 +539,7 @@ proc ::tk::TextButton1 {w x y} { } # Allow focus in any case on Windows, because that will let the # selection be displayed even for state disabled text widgets. - if {$::tcl_platform(platform) eq "windows" \ + if {[tk windowingsystem] eq "win32" \ || [$w cget -state] eq "normal"} { focus $w } @@ -1096,7 +1096,7 @@ proc ::tk_textPaste w { # w - The text window in which the cursor is to move. # start - Position at which to start search. -if {$tcl_platform(platform) eq "windows"} { +if {[tk windowingsystem] eq "win32"} { proc ::tk::TextNextWord {w start} { TextNextPos $w [TextNextPos $w $start tcl_endOfWord] \ tcl_startOfNextWord diff --git a/mingw/lib/tk8.5/tk.tcl b/mingw/lib/tk8.5/tk.tcl index 8e967cb5..8d6f0f95 100644 --- a/mingw/lib/tk8.5/tk.tcl +++ b/mingw/lib/tk8.5/tk.tcl @@ -15,7 +15,7 @@ package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp before # Insist on running with compatible version of Tcl package require Tcl 8.5.0 # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.5.11 +package require -exact Tk 8.5.13 # Create a ::tk namespace namespace eval ::tk { @@ -112,26 +112,23 @@ proc ::tk::PlaceWindow {w {place ""} {anchor ""}} { set y [expr {([winfo screenheight $w]-[winfo reqheight $w])/2}] set checkBounds 0 } - if {[tk windowingsystem] eq "win32"} { - # Bug 533519: win32 multiple desktops may produce negative geometry. - set checkBounds 0 - } if {$checkBounds} { - if {$x < 0} { - set x 0 - } elseif {$x > ([winfo screenwidth $w]-[winfo reqwidth $w])} { - set x [expr {[winfo screenwidth $w]-[winfo reqwidth $w]}] + if {$x < [winfo vrootx $w]} { + set x [winfo vrootx $w] + } elseif {$x > ([winfo vrootx $w]+[winfo vrootwidth $w]-[winfo reqwidth $w])} { + set x [expr {[winfo vrootx $w]+[winfo vrootwidth $w]-[winfo reqwidth $w]}] } - if {$y < 0} { - set y 0 - } elseif {$y > ([winfo screenheight $w]-[winfo reqheight $w])} { - set y [expr {[winfo screenheight $w]-[winfo reqheight $w]}] + if {$y < [winfo vrooty $w]} { + set y [winfo vrooty $w] + } elseif {$y > ([winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w])} { + set y [expr {[winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w]}] } if {[tk windowingsystem] eq "aqua"} { # Avoid the native menu bar which sits on top of everything. if {$y < 22} { set y 22 } } } + wm maxsize $w [winfo vrootwidth $w] [winfo vrootheight $w] wm geometry $w +$x+$y wm deiconify $w } @@ -208,7 +205,7 @@ proc ::tk::RestoreFocusGrab {grab focus {destroy destroy}} { # Results: # Returns the selection, or an error if none could be found # -if {$tcl_platform(platform) eq "unix"} { +if {[tk windowingsystem] ne "win32"} { proc ::tk::GetSelection {w {sel PRIMARY}} { if {[catch {selection get -displayof $w -selection $sel \ -type UTF8_STRING} txt] \ diff --git a/mingw/lib/tk8.5/tkAppInit.c b/mingw/lib/tk8.5/tkAppInit.c index 050e2267..422b9e1e 100644 --- a/mingw/lib/tk8.5/tkAppInit.c +++ b/mingw/lib/tk8.5/tkAppInit.c @@ -15,7 +15,7 @@ #include "locale.h" #ifdef TK_TEST -extern int Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp)); +extern int Tktest_Init(Tcl_Interp *interp); #endif /* TK_TEST */ /* @@ -50,7 +50,7 @@ main( #ifndef TK_LOCAL_APPINIT #define TK_LOCAL_APPINIT Tcl_AppInit #endif - extern int TK_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp)); + extern int TK_LOCAL_APPINIT (Tcl_Interp *interp); /* * The following #if block allows you to change how Tcl finds the startup @@ -59,7 +59,7 @@ main( */ #ifdef TK_LOCAL_MAIN_HOOK - extern int TK_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv)); + extern int TK_LOCAL_MAIN_HOOK (int *argc, char ***argv); TK_LOCAL_MAIN_HOOK(&argc, &argv); #endif diff --git a/mingw/lib/tk8.5/tkfbox.tcl b/mingw/lib/tk8.5/tkfbox.tcl index 78112e14..e145805a 100644 --- a/mingw/lib/tk8.5/tkfbox.tcl +++ b/mingw/lib/tk8.5/tkfbox.tcl @@ -18,7 +18,7 @@ # package require Ttk - + #---------------------------------------------------------------------- # # I C O N L I S T @@ -786,7 +786,7 @@ proc ::tk::IconList_Reset {w} { unset -nocomplain Priv(ILAccel,$w) } - + #---------------------------------------------------------------------- # # F I L E D I A L O G @@ -914,7 +914,7 @@ proc ::tk::dialog::file:: {type args} { # Withdraw the window, then update all the geometry information # so we know how big it wants to be, then center the window in the - # display and de-iconify it. + # display (Motif style) and de-iconify it. ::tk::PlaceWindow $w widget $data(-parent) wm title $w $data(-title) @@ -1326,36 +1326,16 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}] set showHidden $::tk::dialog::file::showHiddenVar - # Make the dir list - # Using -directory [pwd] is better in some VFS cases. - set cmd [list glob -tails -directory [pwd] -type d -nocomplain *] - if {$showHidden} { lappend cmd .* } - set dirs [lsort -dictionary -unique [eval $cmd]] - set dirList {} - foreach d $dirs { - if {$d eq "." || $d eq ".."} { - continue - } - lappend dirList $d - } - ::tk::IconList_Add $data(icons) $folder $dirList + # Make the dir list. Note that using an explicit [pwd] (instead of '.') is + # better in some VFS cases. + ::tk::IconList_Add $data(icons) $folder [GlobFiltered [pwd] d 1] if {$class eq "TkFDialog"} { - # Make the file list if this is a File Dialog, selecting all - # but 'd'irectory type files. + # Make the file list if this is a File Dialog, selecting all but + # 'd'irectory type files. # - set cmd [list glob -tails -directory [pwd] \ - -type {f b c l p s} -nocomplain] - if {$data(filter) eq "*"} { - lappend cmd * - if {$showHidden} { - lappend cmd .* - } - } else { - eval [list lappend cmd] $data(filter) - } - set fileList [lsort -dictionary -unique [eval $cmd]] - ::tk::IconList_Add $data(icons) $file $fileList + ::tk::IconList_Add $data(icons) $file \ + [GlobFiltered [pwd] {f b c l p s}] } ::tk::IconList_Arrange $data(icons) @@ -1884,49 +1864,60 @@ proc ::tk::dialog::file::Done {w {selectFilePath ""}} { set Priv(selectFilePath) $selectFilePath } +proc ::tk::dialog::file::GlobFiltered {dir type {overrideFilter 0}} { + # $dir == where to search + # $type == what to look for ('d' or 'f b c l p s') + # $overrideFilter == whether to ignore the filter + + variable showHiddenVar + upvar 1 data(filter) filter + + if {$filter eq "*" || $overrideFilter} { + set patterns [list *] + if {$showHiddenVar} { + lappend patterns .* + } + } elseif {[string is list $filter]} { + set patterns $filter + } else { + # Invalid list; assume we can use non-whitespace sequences as words + set patterns [regexp -inline -all {\S+} $filter] + } + + set opts [list -tails -directory $dir -type $type -nocomplain] + + set result {} + catch { + # We have a catch because we might have a really bad pattern (e.g., + # with an unbalanced brace); even [glob -nocomplain] doesn't like it. + # Using a catch ensures that it just means we match nothing instead of + # throwing a nasty error at the user... + foreach f [glob {*}$opts -- {*}$patterns] { + if {$f eq "." || $f eq ".."} { + continue + } + lappend result $f + } + } + return [lsort -dictionary -unique $result] +} + proc ::tk::dialog::file::CompleteEnt {w} { upvar ::tk::dialog::file::[winfo name $w] data set f [$data(ent) get] if {$data(-multiple)} { - if {[catch {llength $f} len] || $len != 1} { + if {![string is list $f] || [llength $f] != 1} { return -code break } set f [lindex $f 0] } # Get list of matching filenames and dirnames - set globF [list glob -tails -directory $data(selectPath) \ - -type {f b c l p s} -nocomplain] - set globD [list glob -tails -directory $data(selectPath) -type d \ - -nocomplain *] - if {$data(filter) eq "*"} { - lappend globF * - if {$::tk::dialog::file::showHiddenVar} { - lappend globF .* - lappend globD .* - } - if {[winfo class $w] eq "TkFDialog"} { - set files [lsort -dictionary -unique [{*}$globF]] - } else { - set files {} - } - set dirs [lsort -dictionary -unique [{*}$globD]] - } else { - if {$::tk::dialog::file::showHiddenVar} { - lappend globD .* - } - if {[winfo class $w] eq "TkFDialog"} { - set files [lsort -dictionary -unique [{*}$globF {*}$data(filter)]] - } else { - set files {} - } - set dirs [lsort -dictionary -unique [{*}$globD]] - } - # Filter specials - set dirs [lsearch -all -not -exact -inline $dirs .] - set dirs [lsearch -all -not -exact -inline $dirs ..] + set files [if {[winfo class $w] eq "TkFDialog"} { + GlobFiltered $data(selectPath) {f b c l p s} + }] set dirs2 {} - foreach d $dirs {lappend dirs2 $d/} + foreach d [GlobFiltered $data(selectPath) d] {lappend dirs2 $d/} set targets [concat \ [lsearch -glob -all -inline $files $f*] \ diff --git a/mingw/lib/tk8.5/ttk/combobox.tcl b/mingw/lib/tk8.5/ttk/combobox.tcl index eab3e1a3..03821a21 100644 --- a/mingw/lib/tk8.5/ttk/combobox.tcl +++ b/mingw/lib/tk8.5/ttk/combobox.tcl @@ -112,9 +112,12 @@ switch -- [tk windowingsystem] { # proc ttk::combobox::Press {mode w x y} { variable State + + $w instate disabled { return } + set State(entryPress) [expr { - [$w instate {!readonly !disabled}] - && [string match *textarea [$w identify $x $y]] + [$w instate !readonly] + && [string match *textarea [$w identify element $x $y]] }] focus $w diff --git a/mingw/lib/tk8.5/ttk/entry.tcl b/mingw/lib/tk8.5/ttk/entry.tcl index e60df90d..2c9fbc8f 100644 --- a/mingw/lib/tk8.5/ttk/entry.tcl +++ b/mingw/lib/tk8.5/ttk/entry.tcl @@ -229,7 +229,7 @@ proc ttk::entry::See {w {index insert}} { # position following the next end-of-word position. # set ::ttk::entry::State(startNext) \ - [string equal $::tcl_platform(platform) "windows"] + [string equal [tk windowingsystem] "win32"] proc ttk::entry::NextWord {w start} { variable State diff --git a/mingw/lib/tk85.lib b/mingw/lib/tk85.lib deleted file mode 100644 index da4f4598..00000000 Binary files a/mingw/lib/tk85.lib and /dev/null differ diff --git a/mingw/lib/tkConfig.sh b/mingw/lib/tkConfig.sh index 32e37d51..e90ec5e5 100644 --- a/mingw/lib/tkConfig.sh +++ b/mingw/lib/tkConfig.sh @@ -17,10 +17,10 @@ TK_DLL_FILE="tk85.dll" TK_VERSION='8.5' TK_MAJOR_VERSION='8' TK_MINOR_VERSION='5' -TK_PATCH_LEVEL='.11' +TK_PATCH_LEVEL='.13' # -D flags for use with the C compiler. -TK_DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -Dinline=__inline -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_UXTHEME_H=1 -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 ' +TK_DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_NO_SEH=1 -DEXCEPTION_DISPOSITION=int -DHAVE_WINNT_IGNORE_VOID=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_UXTHEME_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1 ' # Flag, 1: we built a shared lib, 0 we didn't TK_SHARED_BUILD=1 @@ -29,10 +29,10 @@ TK_SHARED_BUILD=1 TK_DBGX= # The name of the Tk library (may be either a .a file or a shared library): -TK_LIB_FILE='tk85.lib' +TK_LIB_FILE='libtk85.a' # Additional libraries to use when linking Tk. -TK_LIBS='user32.lib advapi32.lib ws2_32.lib gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib' +TK_LIBS='-lws2_32 -lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32' # Top-level directory in which Tcl's platform-independent files are # installed. @@ -47,7 +47,7 @@ TK_LIB_FLAG='-ltk85' # String to pass to linker to pick up the Tk library from its # build directory. -TK_BUILD_LIB_SPEC='-L/src/tcltk/tk8.5.11/win -ltk85' +TK_BUILD_LIB_SPEC='-L/src/tcltk/tk8.5.13/win -ltk85' # String to pass to linker to pick up the Tk library from its # installed directory. @@ -59,7 +59,7 @@ TK_LIB_SPEC='-L/mingw/lib -ltk85' # different place than the directory containing the source files, this # points to the location of the sources, not the location where Tk was # compiled. -TK_SRC_DIR='/src/tcltk/tk8.5.11' +TK_SRC_DIR='/src/tcltk/tk8.5.13' # Needed if you want to make a 'fat' shared library library # containing tk objects or link a different wish. @@ -67,21 +67,21 @@ TK_CC_SEARCH_FLAGS='' TK_LD_SEARCH_FLAGS='' # The name of the Tk stub library (.a): -TK_STUB_LIB_FILE='tkstub85.lib' +TK_STUB_LIB_FILE='libtkstub85.a' # -l flag to pass to the linker to pick up the Tk stub library TK_STUB_LIB_FLAG='-ltkstub85' # String to pass to linker to pick up the Tk stub library from its # build directory. -TK_BUILD_STUB_LIB_SPEC='-L/src/tcltk/tk8.5.11/win -ltkstub85' +TK_BUILD_STUB_LIB_SPEC='-L/src/tcltk/tk8.5.13/win -ltkstub85' # String to pass to linker to pick up the Tk stub library from its # installed directory. TK_STUB_LIB_SPEC='-L/mingw/lib -ltkstub85' # Path to the Tk stub library in the build directory. -TK_BUILD_STUB_LIB_PATH='/src/tcltk/tk8.5.11/win/tkstub85.lib' +TK_BUILD_STUB_LIB_PATH='/src/tcltk/tk8.5.13/win/libtkstub85.a' # Path to the Tk stub library in the install directory. -TK_STUB_LIB_PATH='/mingw/lib/tkstub85.lib' +TK_STUB_LIB_PATH='/mingw/lib/libtkstub85.a' diff --git a/mingw/lib/tkstub85.lib b/mingw/lib/tkstub85.lib deleted file mode 100644 index 7efe036d..00000000 Binary files a/mingw/lib/tkstub85.lib and /dev/null differ diff --git a/src/tcltk/fileList-tk.txt b/src/tcltk/fileList-tk.txt dissimilarity index 74% index 37b9c0fa..2c5c0b65 100644 --- a/src/tcltk/fileList-tk.txt +++ b/src/tcltk/fileList-tk.txt @@ -1,132 +1,44 @@ -/mingw/bin/tk85.dll -/mingw/bin/wish.exe -/mingw/bin/wish85.exe -/mingw/include/X11/Xutil.h -/mingw/include/tk.h -/mingw/include/tkDecls.h -/mingw/include/tkIntXlibDecls.h -/mingw/include/tkPlatDecls.h -/mingw/lib/tk8.5/bgerror.tcl -/mingw/lib/tk8.5/button.tcl -/mingw/lib/tk8.5/choosedir.tcl -/mingw/lib/tk8.5/clrpick.tcl -/mingw/lib/tk8.5/comdlg.tcl -/mingw/lib/tk8.5/console.tcl -/mingw/lib/tk8.5/demos/README -/mingw/lib/tk8.5/demos/anilabel.tcl -/mingw/lib/tk8.5/demos/aniwave.tcl -/mingw/lib/tk8.5/demos/arrow.tcl -/mingw/lib/tk8.5/demos/bind.tcl -/mingw/lib/tk8.5/demos/bitmap.tcl -/mingw/lib/tk8.5/demos/browse -/mingw/lib/tk8.5/demos/button.tcl -/mingw/lib/tk8.5/demos/check.tcl -/mingw/lib/tk8.5/demos/clrpick.tcl -/mingw/lib/tk8.5/demos/colors.tcl -/mingw/lib/tk8.5/demos/combo.tcl -/mingw/lib/tk8.5/demos/cscroll.tcl -/mingw/lib/tk8.5/demos/ctext.tcl -/mingw/lib/tk8.5/demos/dialog1.tcl -/mingw/lib/tk8.5/demos/dialog2.tcl -/mingw/lib/tk8.5/demos/entry1.tcl -/mingw/lib/tk8.5/demos/entry2.tcl -/mingw/lib/tk8.5/demos/entry3.tcl -/mingw/lib/tk8.5/demos/filebox.tcl -/mingw/lib/tk8.5/demos/floor.tcl -/mingw/lib/tk8.5/demos/form.tcl -/mingw/lib/tk8.5/demos/hello -/mingw/lib/tk8.5/demos/hscale.tcl -/mingw/lib/tk8.5/demos/icon.tcl -/mingw/lib/tk8.5/demos/image1.tcl -/mingw/lib/tk8.5/demos/image2.tcl -/mingw/lib/tk8.5/demos/items.tcl -/mingw/lib/tk8.5/demos/ixset -/mingw/lib/tk8.5/demos/label.tcl -/mingw/lib/tk8.5/demos/labelframe.tcl -/mingw/lib/tk8.5/demos/mclist.tcl -/mingw/lib/tk8.5/demos/menu.tcl -/mingw/lib/tk8.5/demos/menubu.tcl -/mingw/lib/tk8.5/demos/msgbox.tcl -/mingw/lib/tk8.5/demos/paned1.tcl -/mingw/lib/tk8.5/demos/paned2.tcl -/mingw/lib/tk8.5/demos/pendulum.tcl -/mingw/lib/tk8.5/demos/plot.tcl -/mingw/lib/tk8.5/demos/puzzle.tcl -/mingw/lib/tk8.5/demos/radio.tcl -/mingw/lib/tk8.5/demos/rmt -/mingw/lib/tk8.5/demos/rolodex -/mingw/lib/tk8.5/demos/ruler.tcl -/mingw/lib/tk8.5/demos/sayings.tcl -/mingw/lib/tk8.5/demos/search.tcl -/mingw/lib/tk8.5/demos/spin.tcl -/mingw/lib/tk8.5/demos/square -/mingw/lib/tk8.5/demos/states.tcl -/mingw/lib/tk8.5/demos/style.tcl -/mingw/lib/tk8.5/demos/tcolor -/mingw/lib/tk8.5/demos/text.tcl -/mingw/lib/tk8.5/demos/textpeer.tcl -/mingw/lib/tk8.5/demos/timer -/mingw/lib/tk8.5/demos/toolbar.tcl -/mingw/lib/tk8.5/demos/tree.tcl -/mingw/lib/tk8.5/demos/ttkbut.tcl -/mingw/lib/tk8.5/demos/ttkmenu.tcl -/mingw/lib/tk8.5/demos/ttknote.tcl -/mingw/lib/tk8.5/demos/ttkpane.tcl -/mingw/lib/tk8.5/demos/ttkprogress.tcl -/mingw/lib/tk8.5/demos/ttkscale.tcl -/mingw/lib/tk8.5/demos/twind.tcl -/mingw/lib/tk8.5/demos/unicodeout.tcl -/mingw/lib/tk8.5/demos/vscale.tcl -/mingw/lib/tk8.5/demos/widget -/mingw/lib/tk8.5/dialog.tcl -/mingw/lib/tk8.5/entry.tcl -/mingw/lib/tk8.5/focus.tcl -/mingw/lib/tk8.5/images/README -/mingw/lib/tk8.5/listbox.tcl -/mingw/lib/tk8.5/menu.tcl -/mingw/lib/tk8.5/mkpsenc.tcl -/mingw/lib/tk8.5/msgbox.tcl -/mingw/lib/tk8.5/msgs/de.msg -/mingw/lib/tk8.5/obsolete.tcl -/mingw/lib/tk8.5/optMenu.tcl -/mingw/lib/tk8.5/palette.tcl -/mingw/lib/tk8.5/panedwindow.tcl -/mingw/lib/tk8.5/pkgIndex.tcl -/mingw/lib/tk8.5/safetk.tcl -/mingw/lib/tk8.5/scale.tcl -/mingw/lib/tk8.5/scrlbar.tcl -/mingw/lib/tk8.5/spinbox.tcl -/mingw/lib/tk8.5/tearoff.tcl -/mingw/lib/tk8.5/text.tcl -/mingw/lib/tk8.5/tk.tcl -/mingw/lib/tk8.5/tkAppInit.c -/mingw/lib/tk8.5/tkfbox.tcl -/mingw/lib/tk8.5/ttk/altTheme.tcl -/mingw/lib/tk8.5/ttk/aquaTheme.tcl -/mingw/lib/tk8.5/ttk/button.tcl -/mingw/lib/tk8.5/ttk/clamTheme.tcl -/mingw/lib/tk8.5/ttk/classicTheme.tcl -/mingw/lib/tk8.5/ttk/combobox.tcl -/mingw/lib/tk8.5/ttk/cursors.tcl -/mingw/lib/tk8.5/ttk/defaults.tcl -/mingw/lib/tk8.5/ttk/entry.tcl -/mingw/lib/tk8.5/ttk/fonts.tcl -/mingw/lib/tk8.5/ttk/menubutton.tcl -/mingw/lib/tk8.5/ttk/notebook.tcl -/mingw/lib/tk8.5/ttk/panedwindow.tcl -/mingw/lib/tk8.5/ttk/progress.tcl -/mingw/lib/tk8.5/ttk/scale.tcl -/mingw/lib/tk8.5/ttk/scrollbar.tcl -/mingw/lib/tk8.5/ttk/sizegrip.tcl -/mingw/lib/tk8.5/ttk/spinbox.tcl -/mingw/lib/tk8.5/ttk/treeview.tcl -/mingw/lib/tk8.5/ttk/ttk.tcl -/mingw/lib/tk8.5/ttk/utils.tcl -/mingw/lib/tk8.5/ttk/vistaTheme.tcl -/mingw/lib/tk8.5/ttk/winTheme.tcl -/mingw/lib/tk8.5/ttk/xpTheme.tcl -/mingw/lib/tk8.5/unsupported.tcl -/mingw/lib/tk8.5/xmfbox.tcl -/mingw/lib/tk85.lib -/mingw/lib/tkConfig.sh -/mingw/lib/tkstub85.lib +/mingw/bin/tk85.dll +/mingw/bin/wish.exe +/mingw/bin/wish85.exe +/mingw/include/X11/X.h +/mingw/include/X11/Xfuncproto.h +/mingw/include/X11/Xlib.h +/mingw/include/X11/Xutil.h +/mingw/include/X11/keysym.h +/mingw/include/tk.h +/mingw/include/tkIntXlibDecls.h +/mingw/include/tkPlatDecls.h +/mingw/lib/libtk85.a +/mingw/lib/libtkstub85.a +/mingw/lib/tk8.5/bgerror.tcl +/mingw/lib/tk8.5/button.tcl +/mingw/lib/tk8.5/choosedir.tcl +/mingw/lib/tk8.5/clrpick.tcl +/mingw/lib/tk8.5/demos/browse +/mingw/lib/tk8.5/demos/hello +/mingw/lib/tk8.5/demos/ixset +/mingw/lib/tk8.5/demos/license.terms +/mingw/lib/tk8.5/demos/mclist.tcl +/mingw/lib/tk8.5/demos/menu.tcl +/mingw/lib/tk8.5/demos/rmt +/mingw/lib/tk8.5/demos/rolodex +/mingw/lib/tk8.5/demos/tcolor +/mingw/lib/tk8.5/demos/text.tcl +/mingw/lib/tk8.5/demos/timer +/mingw/lib/tk8.5/demos/toolbar.tcl +/mingw/lib/tk8.5/demos/widget +/mingw/lib/tk8.5/dialog.tcl +/mingw/lib/tk8.5/entry.tcl +/mingw/lib/tk8.5/menu.tcl +/mingw/lib/tk8.5/msgbox.tcl +/mingw/lib/tk8.5/pkgIndex.tcl +/mingw/lib/tk8.5/scale.tcl +/mingw/lib/tk8.5/spinbox.tcl +/mingw/lib/tk8.5/text.tcl +/mingw/lib/tk8.5/tk.tcl +/mingw/lib/tk8.5/tkAppInit.c +/mingw/lib/tk8.5/tkfbox.tcl +/mingw/lib/tk8.5/ttk/combobox.tcl +/mingw/lib/tk8.5/ttk/entry.tcl +/mingw/lib/tkConfig.sh