summaryrefslogtreecommitdiff
path: root/macosx/plugins/PeopsXgl/macsrc
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-11-12 22:50:37 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-11-12 22:50:37 +0000
commitb83c8fe686c5374b38b31510f9803d3908d0c4f8 (patch)
treece9eb52a3e041128304bd79a2065c75029aca9a9 /macosx/plugins/PeopsXgl/macsrc
parent98f9382fb8307e539091454392ca658648f722b8 (diff)
downloadpcsxr-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/PeopsXgl/macsrc')
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h2
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m14
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/drawgl.m2
3 files changed, 9 insertions, 9 deletions
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
index a60a4b81..6ad83f63 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
@@ -44,7 +44,7 @@ extern PluginWindowController *gameController;
}
+ (id)openGameView;
-- (PluginGLView *)getOpenGLView;
+- (PluginGLView *)openGLView;
- (BOOL)fullscreen;
- (void)setFullscreen:(BOOL)flag;
- (void)performFullscreenSwap;
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];
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
index 70c5a15e..dcf9e675 100644
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -155,7 +155,7 @@ unsigned long ulInitDisplay(void) // OPEN GAME WINDOW
// this causes a runtime error if it's done on a thread other than the main thread
dispatch_sync(dispatch_get_main_queue(), ^{
windowController = [PluginWindowController openGameView];
- glView = [windowController getOpenGLView];
+ glView = [windowController openGLView];
[[windowController window] setTitle:[NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]];
});