summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-12 09:49:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-12 09:49:34 (GMT)
commit8f3dfc99087716125f466209364f3d24d98c07be (patch)
treee3fa63adcd3593c816750f84f855789fd50af1c8 /macosx
parent4a2efd946fe6674e460172920d097f7329d8e5d9 (diff)
parentc84948f660d87bfecd5cf830a4986d95f00c1e4a (diff)
downloadtk-8f3dfc99087716125f466209364f3d24d98c07be.zip
tk-8f3dfc99087716125f466209364f3d24d98c07be.tar.gz
tk-8f3dfc99087716125f466209364f3d24d98c07be.tar.bz2
Fix [2049429]: Some options aren't picked up from the options database.
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) {