diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-08-16 02:25:06 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-08-16 02:25:06 (GMT) |
| commit | 4b1da35c017b16355d7f8a343f9c81edad30214f (patch) | |
| tree | f917920573ac7301a6f8ac4195b531c7d340fcc6 /generic | |
| parent | dba94e780143122a611e39861db5ced7c8d0f0cd (diff) | |
| parent | 4875d4135079ccec5bf1e4e60a5b6a835dbc8602 (diff) | |
| download | tk-4b1da35c017b16355d7f8a343f9c81edad30214f.zip tk-4b1da35c017b16355d7f8a343f9c81edad30214f.tar.gz tk-4b1da35c017b16355d7f8a343f9c81edad30214f.tar.bz2 | |
Merge in core-8-6-branch including updates for macOS 10.15 Catalina
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCanvas.c | 6 | ||||
| -rw-r--r-- | generic/tkEvent.c | 4 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | generic/tkTextTag.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index ab648a1..92a7706 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -1027,7 +1027,7 @@ CanvasWidgetCmd( result = TCL_ERROR; goto done; } - if (mask & (unsigned) ~(ButtonMotionMask|Button1MotionMask + if (mask & ~(unsigned long)(ButtonMotionMask|Button1MotionMask |Button2MotionMask|Button3MotionMask|Button4MotionMask |Button5MotionMask|ButtonPressMask|ButtonReleaseMask |EnterWindowMask|LeaveWindowMask|KeyPressMask @@ -4747,7 +4747,7 @@ CanvasBindProc( XEvent *eventPtr) /* Pointer to X event that just happened. */ { TkCanvas *canvasPtr = clientData; - int mask; + unsigned long mask; Tcl_Preserve(canvasPtr); @@ -4843,7 +4843,7 @@ PickCurrentItem( * ButtonRelease, or MotionNotify. */ { double coords[2]; - unsigned int buttonDown; + unsigned long buttonDown; Tk_Item *prevItemPtr; #ifndef USE_OLD_TAG_SEARCH SearchUids *searchUids = GetStaticUids(); diff --git a/generic/tkEvent.c b/generic/tkEvent.c index 753a31b..56b32af 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -536,11 +536,11 @@ RefreshKeyboardMappingIfNeeded( *---------------------------------------------------------------------- */ -static const int buttonMasks[] = { +static const unsigned long buttonMasks[] = { 0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask }; -int +unsigned long TkGetButtonMask( unsigned int button) { diff --git a/generic/tkInt.h b/generic/tkInt.h index 124a8f5..a4f2be4 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -940,7 +940,7 @@ typedef struct TkpClipMask { (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask) -MODULE_SCOPE int TkGetButtonMask(unsigned int); +MODULE_SCOPE unsigned long TkGetButtonMask(unsigned int); /* * Object types not declared in tkObj.c need to be mentioned here so they can diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index 5cb08ec..0d223fe 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -292,7 +292,7 @@ TkTextTagCmd( if (mask == 0) { return TCL_ERROR; } - if (mask & (unsigned) ~(ButtonMotionMask|Button1MotionMask + if (mask & ~(unsigned long)(ButtonMotionMask|Button1MotionMask |Button2MotionMask|Button3MotionMask|Button4MotionMask |Button5MotionMask|ButtonPressMask|ButtonReleaseMask |EnterWindowMask|LeaveWindowMask|KeyPressMask @@ -1491,7 +1491,7 @@ TkTextBindProc( unsigned int oldState; oldState = eventPtr->xbutton.state; - eventPtr->xbutton.state &= ~ALL_BUTTONS; + eventPtr->xbutton.state &= ~(unsigned long)ALL_BUTTONS; if (!(textPtr->flags & DESTROYED)) { TkTextPickCurrent(textPtr, eventPtr); } diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index cda98a0..3674ae5 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -923,7 +923,7 @@ static void DragColumn(Treeview *tv, int i, int delta) static TreeItem *IdentifyItem(Treeview *tv, int y); /*forward*/ -static const unsigned int TreeviewBindEventMask = +static const unsigned long TreeviewBindEventMask = KeyPressMask|KeyReleaseMask | ButtonPressMask|ButtonReleaseMask | PointerMotionMask|ButtonMotionMask |