diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 08:10:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 08:10:29 (GMT) |
| commit | 7b3b30d439640b2474a81ff1b97c8ae264811165 (patch) | |
| tree | 05e00c4d3ff33c3693eecf185af839c020854fc1 /macosx/tkMacOSXDialog.c | |
| parent | 3d9f5433b611ddba5d4c1f219d61bfcde319034f (diff) | |
| parent | 44cdf94725d440ad4b97077853722891d2d9cd7d (diff) | |
| download | tk-7b3b30d439640b2474a81ff1b97c8ae264811165.zip tk-7b3b30d439640b2474a81ff1b97c8ae264811165.tar.gz tk-7b3b30d439640b2474a81ff1b97c8ae264811165.tar.bz2 | |
Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.
*** POTENTIAL INCOMPATIBILITY *** on Windows only: gcc/clang/MSVC will generate new warnings in extensions when the "None" symbol is used incorrectly.
Those warnings are all fixed in the core, that's what most of this commit is doing.
Diffstat (limited to 'macosx/tkMacOSXDialog.c')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index e828b39..c3778f1 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -1194,12 +1194,12 @@ TkAboutDlg(void) NSString *year = [dateFormatter stringFromDate:[NSDate date]]; [dateFormatter release]; - + /* * This replaces the old about dialog with a standard alert that displays * correctly on 10.14. */ - + NSString *version = @"Tcl " TCL_PATCH_LEVEL " & Tk " TCL_PATCH_LEVEL; NSString *url = @"www.tcl-lang.org"; NSTextView *credits = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,300,300)]; |