diff options
author | fvogel <fvogel@noemail.net> | 2016-01-13 18:07:17 (GMT) |
---|---|---|
committer | fvogel <fvogel@noemail.net> | 2016-01-13 18:07:17 (GMT) |
commit | 714bb778d6935a81dc36ce0ad8f80b198ee4d2ba (patch) | |
tree | 375869cab17faca3d43a067cb1c21fa0a122db73 /macosx | |
parent | f1adfab605f0e1e5c7ec6d879a591b732820b4c2 (diff) | |
parent | 0a040504a8dfa728d1c25cd3c70824a0ccfb746e (diff) | |
download | tk-714bb778d6935a81dc36ce0ad8f80b198ee4d2ba.zip tk-714bb778d6935a81dc36ce0ad8f80b198ee4d2ba.tar.gz tk-714bb778d6935a81dc36ce0ad8f80b198ee4d2ba.tar.bz2 |
Rebased to latest trunk
FossilOrigin-Name: 51daaaff2bf50f70a0000dce9692e0bf0d8ce429
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 202dbbd..b27f9ff 100644 --- a/macosx/README +++ b/macosx/README @@ -401,7 +401,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 257f16d..f6edb6d 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -1030,7 +1030,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) { |