diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-13 07:33:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-13 07:33:47 (GMT) |
| commit | 984eee177d6ec246d89f217160f1e2cf5b60d8fa (patch) | |
| tree | 2881e0bb82ad92c44152a7c399ead95aaa5cece6 | |
| parent | 6d317fc172222419a5444561269da7ff6a3e5d7c (diff) | |
| parent | 6e359bd331f0d8c53f8c10cebc13784f866b6968 (diff) | |
| download | tk-984eee177d6ec246d89f217160f1e2cf5b60d8fa.zip tk-984eee177d6ec246d89f217160f1e2cf5b60d8fa.tar.gz tk-984eee177d6ec246d89f217160f1e2cf5b60d8fa.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tkCanvas.c | 4 | ||||
| -rw-r--r-- | generic/tkEvent.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | generic/tkTextTag.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 1c70055..2683344 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -1036,7 +1036,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 @@ -5079,7 +5079,7 @@ CanvasBindProc( XEvent *eventPtr) /* Pointer to X event that just happened. */ { TkCanvas *canvasPtr = clientData; - unsigned int mask; + unsigned long mask; Tcl_Preserve(canvasPtr); diff --git a/generic/tkEvent.c b/generic/tkEvent.c index f86ac36..b13200b 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -540,7 +540,7 @@ static const unsigned int buttonMasks[] = { 0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask, Button6Mask, Button7Mask, Button8Mask, Button9Mask }; -unsigned int +unsigned long TkGetButtonMask( unsigned int button) { diff --git a/generic/tkInt.h b/generic/tkInt.h index 5796103..4f17934 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -994,7 +994,7 @@ typedef struct TkpClipMask { (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask|Button8Mask|Button9Mask) -MODULE_SCOPE unsigned 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 bda315e..ed6df3e 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 diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index 5b5375c..822a4a6 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -921,7 +921,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 |