diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-26 14:59:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-26 14:59:12 (GMT) |
| commit | ccc7f53ac59980eae109a3314ba3599a8b851fb1 (patch) | |
| tree | 463107a795438fdd55c228d1b20cd4499d48a231 /generic | |
| parent | 36b48da5ca6c18d23f774188450f6f2bedbf1034 (diff) | |
| parent | b68e469c6fcec04a86935ae2e8853197213f40db (diff) | |
| download | tk-ccc7f53ac59980eae109a3314ba3599a8b851fb1.zip tk-ccc7f53ac59980eae109a3314ba3599a8b851fb1.tar.gz tk-ccc7f53ac59980eae109a3314ba3599a8b851fb1.tar.bz2 | |
Merge 8.5. Undo previous introduced ***POTENTIAL INCOMPATIBLITY*** on win32
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkBind.c | 2 | ||||
| -rw-r--r-- | generic/tkRectOval.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 275e2e6..c67ddcc 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -596,7 +596,7 @@ static const TkStateMap visNotify[] = { }; static const TkStateMap configureRequestDetail[] = { - {0, "None"}, + {0, "None"}, {Above, "Above"}, {Below, "Below"}, {BottomIf, "BottomIf"}, diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c index 01890e1..b6c24a9 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -516,7 +516,7 @@ ConfigureRectOval( * fills (as linewidth controls antialiasing). */ - gcValues.line_width = rectOvalPtr->outline.gc != None ? + gcValues.line_width = rectOvalPtr->outline.gc ? rectOvalPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif |