summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-01-13 18:07:17 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-01-13 18:07:17 (GMT)
commit794924350e0aec20360070b05c6f78fcae3ca8e4 (patch)
tree375869cab17faca3d43a067cb1c21fa0a122db73 /macosx
parent1201c42b26f7206c35a29569fbe4530043a9f7db (diff)
parent66735e827bb722108de5e1a656cbe9eaace0febf (diff)
downloadtk-794924350e0aec20360070b05c6f78fcae3ca8e4.zip
tk-794924350e0aec20360070b05c6f78fcae3ca8e4.tar.gz
tk-794924350e0aec20360070b05c6f78fcae3ca8e4.tar.bz2
Rebased to latest trunk
Diffstat (limited to 'macosx')
-rw-r--r--macosx/README2
-rw-r--r--macosx/tkMacOSXDialog.c2
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) {