summaryrefslogtreecommitdiffstats
path: root/generic/tkScrollbar.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-12-20 08:02:30 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-12-20 08:02:30 (GMT)
commit81b0bd7641a9d2f63154c97d41c27bbb696ef674 (patch)
treea17119411589e8c1291df53e2546243d84e78583 /generic/tkScrollbar.c
parent93d974c265533cf2445446954346be8192e850a0 (diff)
downloadtk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.zip
tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.tar.gz
tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.tar.bz2
Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.
Also fix a few newer (harmless) gcc warnings.
Diffstat (limited to 'generic/tkScrollbar.c')
-rw-r--r--generic/tkScrollbar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c
index ba42c20..67fdd2b 100644
--- a/generic/tkScrollbar.c
+++ b/generic/tkScrollbar.c
@@ -188,7 +188,7 @@ Tk_ScrollbarCmd(
scrollPtr->lastUnit = 0;
scrollPtr->firstFraction = 0.0;
scrollPtr->lastFraction = 0.0;
- scrollPtr->cursor = None;
+ scrollPtr->cursor = 0;
scrollPtr->takeFocus = NULL;
scrollPtr->flags = 0;