diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-12 09:55:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-12 09:55:10 (GMT) |
| commit | bbcec99c56690c05359f41e55c6dd7f3461c9aee (patch) | |
| tree | 12257d15527f04bace662918215c674b61ecf864 /macosx | |
| parent | 44cda04c842ee384d0e830bbb247787ee0819fee (diff) | |
| download | tk-bbcec99c56690c05359f41e55c6dd7f3461c9aee.zip tk-bbcec99c56690c05359f41e55c6dd7f3461c9aee.tar.gz tk-bbcec99c56690c05359f41e55c6dd7f3461c9aee.tar.bz2 | |
(cherry-pick) Fix [2049429]: Some options aren't picked up from the options database.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/README | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/README b/macosx/README index 7b17fb8..8940ee6 100644 --- a/macosx/README +++ b/macosx/README @@ -399,7 +399,7 @@ The main program in a typical OSX application looks like this (see *) } The run method implements the event loop for the application. There -are three key steps in the run method. First it calls +are three key steps in the run method. First it calls [NSApp finishLaunching], which creates the bouncing application icon and does other mysterious things. Second it creates an NSAutoreleasePool. Third, it starts an event loop which drains the diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 6af6b33..67f17be 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -1027,7 +1027,7 @@ Tk_MessageBoxObjCmd( NSAlert *alert = [NSAlert new]; NSInteger modalReturnCode = 1; BOOL parentIsKey = NO; - + iconIndex = ICON_INFO; typeIndex = TYPE_OK; for (i = 1; i < objc; i += 2) { |