From 2eb6b9148161e90458741e1482df63200776d7c5 Mon Sep 17 00:00:00 2001 From: Damon McDougall Date: Mon, 17 Sep 2012 23:19:42 +0100 Subject: [PATCH 1/2] Fix Objective-C 2.0 error with gcc-4.0 --- src/_macosx.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/_macosx.m b/src/_macosx.m index dd14a6b2afae..e1013ade4581 100644 --- a/src/_macosx.m +++ b/src/_macosx.m @@ -5760,9 +5760,11 @@ - (int)index if(nwin > 0) { [NSApp activateIgnoringOtherApps: YES]; - for (NSWindow *window in [NSApp windows]) { - [window orderFront:nil]; + NSArray *windowsArray = [[NSApp windows] retain]; + for (int i = 0; i < [windowsArray count]; i++) { + [[windowsArray objectAtIndex:i] orderFront:nil]; } + [windowsArray release]; [NSApp run]; } Py_INCREF(Py_None); From fac00b2eba4c6309508d939873d6881a641b543b Mon Sep 17 00:00:00 2001 From: Damon McDougall Date: Tue, 18 Sep 2012 09:54:27 +0100 Subject: [PATCH 2/2] Use NSEnumerator instead of objectAtIndex --- src/_macosx.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/_macosx.m b/src/_macosx.m index e1013ade4581..315af6895b53 100644 --- a/src/_macosx.m +++ b/src/_macosx.m @@ -5760,11 +5760,12 @@ - (int)index if(nwin > 0) { [NSApp activateIgnoringOtherApps: YES]; - NSArray *windowsArray = [[NSApp windows] retain]; - for (int i = 0; i < [windowsArray count]; i++) { - [[windowsArray objectAtIndex:i] orderFront:nil]; + NSArray *windowsArray = [NSApp windows]; + NSEnumerator *enumerator = [windowsArray objectEnumerator]; + NSWindow *window; + while ((window = [enumerator nextObject])) { + [window orderFront:nil]; } - [windowsArray release]; [NSApp run]; } Py_INCREF(Py_None);