Commit f7423799 authored by Kees Bakker's avatar Kees Bakker

Use Objective-C construct for..in instead of oldfashioned C (uikit)

parent b0e7f4b0
...@@ -167,12 +167,9 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display) ...@@ -167,12 +167,9 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
return; return;
} }
const int ismain = (uiscreen == [UIScreen mainScreen]); const BOOL ismain = (uiscreen == [UIScreen mainScreen]);
const NSArray *modes = [uiscreen availableModes]; const NSArray *modes = [uiscreen availableModes];
const NSUInteger mode_count = [modes count]; for (UIScreenMode *uimode in [uiscreen availableModes]) {
NSUInteger i;
for (i = 0; i < mode_count; i++) {
UIScreenMode *uimode = (UIScreenMode *) [modes objectAtIndex:i];
CGSize size = [uimode size]; CGSize size = [uimode size];
mode.format = SDL_PIXELFORMAT_ABGR8888; mode.format = SDL_PIXELFORMAT_ABGR8888;
mode.refresh_rate = 0; mode.refresh_rate = 0;
...@@ -245,12 +242,8 @@ UIKit_VideoInit(_THIS) ...@@ -245,12 +242,8 @@ UIKit_VideoInit(_THIS)
const CGRect rect = [uiscreen bounds]; const CGRect rect = [uiscreen bounds];
UIKit_AddDisplay(uiscreen, uiscreenmode, (int)rect.size.width, (int)rect.size.height); UIKit_AddDisplay(uiscreen, uiscreenmode, (int)rect.size.width, (int)rect.size.height);
} else { } else {
const NSArray *screens = [UIScreen screens]; for (UIScreen *uiscreen in [UIScreen screens]) {
const NSUInteger screen_count = [screens count];
NSUInteger i;
for (i = 0; i < screen_count; i++) {
// the main screen is the first element in the array. // the main screen is the first element in the array.
UIScreen *uiscreen = (UIScreen *) [screens objectAtIndex:i];
UIScreenMode *uiscreenmode = [uiscreen currentMode]; UIScreenMode *uiscreenmode = [uiscreen currentMode];
const CGSize size = [[uiscreen currentMode] size]; const CGSize size = [[uiscreen currentMode] size];
UIKit_AddDisplay(uiscreen, uiscreenmode, (int)size.width, (int)size.height); UIKit_AddDisplay(uiscreen, uiscreenmode, (int)size.width, (int)size.height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment