diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-12 22:50:37 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-12 22:50:37 +0000 |
| commit | b83c8fe686c5374b38b31510f9803d3908d0c4f8 (patch) | |
| tree | ce9eb52a3e041128304bd79a2065c75029aca9a9 /macosx/plugins/DFXVideo/macsrc | |
| parent | 98f9382fb8307e539091454392ca658648f722b8 (diff) | |
| download | pcsxr-b83c8fe686c5374b38b31510f9803d3908d0c4f8.tar.gz | |
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
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc')
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/PluginWindowController.h | 2 | ||||
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/PluginWindowController.m | 6 | ||||
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/drawgl.m | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h index d88bd867..b8eccf4a 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h +++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h @@ -34,7 +34,7 @@ extern PluginWindowController *gameController; } + (id)openGameView; -- (PluginGLView *)getOpenGLView; +- (PluginGLView *)openGLView; - (BOOL)fullscreen; - (void)setFullscreen:(BOOL)flag; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m index 48262e56..7bfa656f 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m @@ -46,7 +46,7 @@ NSRect windowFrame; [gameWindow makeKeyAndOrderFront:nil]; [gameController showWindow:nil]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; if (CGDisplayIsCaptured(display)) { [gameController setFullscreen:YES]; } @@ -54,7 +54,7 @@ NSRect windowFrame; return gameController; } -- (PluginGLView *)getOpenGLView +- (PluginGLView *)openGLView { return (PluginGLView *)glView; } @@ -94,7 +94,7 @@ NSRect windowFrame; { NSWindow *window = [self window]; NSScreen *screen = [window screen]; - CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue]; + CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; NSDisableScreenUpdates(); diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m index 81f5f32e..18d3762a 100644 --- a/macosx/plugins/DFXVideo/macsrc/drawgl.m +++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m @@ -114,7 +114,7 @@ unsigned long ulInitDisplay(void) // OPEN GAME WINDOW } PluginWindowController *windowController = [PluginWindowController openGameView]; - glView = [windowController getOpenGLView]; + glView = [windowController openGLView]; NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]; [[windowController window] setTitle:title]; |