From b83c8fe686c5374b38b31510f9803d3908d0c4f8 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Sat, 12 Nov 2011 22:50:37 +0000 Subject: Changing Mac getters to be more Objective-C. Getters in Objective-C are just named what they are getting, I.E. "getVariable" isn't valid, but "variable" is. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72232 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m') diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m index 5f3ee7dd..5fc97637 100644 --- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m +++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m @@ -94,12 +94,12 @@ NSRect FitRectInRect(NSRect source, NSRect destination) [gameWindow makeKeyAndOrderFront:nil]; [gameController showWindow:nil]; - NSOpenGLView* glInstance = [gameController getOpenGLView]; + NSOpenGLView* glInstance = [gameController openGLView]; [glInstance setFrameSize: windowDefaultRect.size]; [glInstance reshape]; // [glView update]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; if (CGDisplayIsCaptured(display)) { [gameController setFullscreen:YES]; } @@ -141,7 +141,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination) - (NSRect) screenFrame { NSWindow* wind = [self window]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[[wind screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[[wind screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; return NSMakeRect (0,0,CGDisplayPixelsWide(display), CGDisplayPixelsHigh(display)); } @@ -169,7 +169,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination) } -- (PluginGLView *)getOpenGLView +- (PluginGLView *)openGLView { return (PluginGLView *)glView; } @@ -277,7 +277,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination) NSWindow *window = [self window]; NSScreen *screen = [window screen]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; NSRect newPlace; @@ -365,7 +365,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination) NSWindow *window = [self window]; NSScreen *screen = [window screen]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; if ([self fullscreen]){ [window setLevel: NSScreenSaverWindowLevel]; @@ -378,7 +378,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination) // if in fullscreen, we must abdicate mouse hiding and level. NSWindow *window = [self window]; NSScreen *screen = [window screen]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; if ([self fullscreen]){ [window setLevel: NSNormalWindowLevel]; -- cgit v1.2.3