diff options
| -rw-r--r-- | doc/colors.n | 4 | ||||
| -rw-r--r-- | generic/tkBind.c | 16 | ||||
| -rw-r--r-- | macosx/tkMacOSXTest.c | 3 | ||||
| -rw-r--r-- | xlib/X11/Xlib.h | 17 |
4 files changed, 12 insertions, 28 deletions
diff --git a/doc/colors.n b/doc/colors.n index 589dea7..9234824 100644 --- a/doc/colors.n +++ b/doc/colors.n @@ -943,9 +943,9 @@ predecessor. systemControlAccentColor systemControlTextColor systemDisabledControlTextColor -systemLabelColor +systemLabelColor systemLinkColor -systemSelectedTextBackgroundColor +systemSelectedTextBackgroundColor systemSelectedTextColor systemTextBackgroundColor systemTextColor diff --git a/generic/tkBind.c b/generic/tkBind.c index f2a7930..e8827b3 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -575,7 +575,7 @@ static int eventArrayIndex[TK_LASTEVENT]; #define HAS_XKEY_HEAD (KEY|BUTTON|MOTION|VIRTUAL|CROSSING|WHEEL) -/* +/* * The xcrossing struct puts the state field in a different location, but the other * events above agree on where state is located. */ @@ -2945,13 +2945,13 @@ ExpandPercents( evPtr = &eventPtr->xev; flags = (evPtr->type < TK_LASTEVENT) ? flagArray[evPtr->type] : 0; -#define SET_NUMBER(value) { number = value; \ - snprintf(numStorage, sizeof(numStorage), "%ld", number); \ +#define SET_NUMBER(value) { number = (value); \ + snprintf(numStorage, sizeof(numStorage), "%" TCL_LL_MODIFIER "d", number); \ string = numStorage; \ } -#define SET_UNUMBER(value) { unumber = value; \ - snprintf(numStorage, sizeof(numStorage), "%lu", unumber); \ +#define SET_UNUMBER(value) { unumber = (value); \ + snprintf(numStorage, sizeof(numStorage), "%" TCL_LL_MODIFIER "u", unumber); \ string = numStorage; \ } @@ -3153,7 +3153,7 @@ ExpandPercents( break; case 'D': if (flags & WHEEL) { - SET_NUMBER(evPtr->xwheel.delta); + SET_NUMBER((int)evPtr->xbutton.button); /* mis-use button field for this */ } break; case 'E': @@ -3232,7 +3232,7 @@ ExpandPercents( } #undef SET_NUMBER -#undef SET_UNUMBER +#undef SET_UNUMBER Tcl_DStringFree(&buf); } @@ -4036,7 +4036,7 @@ HandleEventGenerate( return TCL_ERROR; } if (flags & WHEEL) { - event.general.xwheel.delta = number; + event.general.xbutton.button = (unsigned)number; /* mis-use button field for this */ } else { badOpt = 1; } diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c index ef633aa..4a3bfb1 100644 --- a/macosx/tkMacOSXTest.c +++ b/macosx/tkMacOSXTest.c @@ -224,7 +224,7 @@ PressButtonObjCmd( static int InjectKeyEventObjCmd( - ClientData clientData, + ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -241,6 +241,7 @@ InjectKeyEventObjCmd( NSEvent *keyEvent; NSUInteger type; MacKeycode macKC; + (void)dummy; if (objc < 3) { wrongArgs: diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index a83efde..0971191 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -627,22 +627,6 @@ typedef struct { int x, y; /* pointer x, y coordinates in event window */ int x_root, y_root; /* coordinates relative to root */ unsigned int state; /* key or button mask */ - int delta; /* detail */ - Bool same_screen; /* same screen flag */ -} XWheelEvent; - -typedef struct { - int type; /* of event */ - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came from a SendEvent request */ - Display *display; /* Display the event was read from */ - Window window; /* "event" window it is reported relative to */ - Window root; /* root window that the event occured on */ - Window subwindow; /* child window */ - Time time; /* milliseconds */ - int x, y; /* pointer x, y coordinates in event window */ - int x_root, y_root; /* coordinates relative to root */ - unsigned int state; /* key or button mask */ unsigned int button; /* detail */ Bool same_screen; /* same screen flag */ } XButtonEvent; @@ -1033,7 +1017,6 @@ typedef union _XEvent { int type; /* must not be changed; first element */ XAnyEvent xany; XKeyEvent xkey; - XWheelEvent xwheel; XButtonEvent xbutton; XMotionEvent xmotion; XCrossingEvent xcrossing; |