summaryrefslogtreecommitdiff
path: root/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-11-10 20:22:50 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-11-10 20:22:50 +0000
commita96ba176322566d9d15b51c714984affcdfc6355 (patch)
treefe6496196975b981955a580d0a0442c235037749 /macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
parent0f8e66e194b903763b6c580599eb47c11f154bdd (diff)
OS X: make all ivars either be in the implementation block, or converted to Objective C 2.0 properties.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92227 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc/PluginWindowController.m')
-rwxr-xr-xmacosx/plugins/DFXVideo/macsrc/PluginWindowController.m16
1 files changed, 9 insertions, 7 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
index d6ddb17d..29b8b387 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
@@ -26,7 +26,9 @@ PluginWindowController *gameController;
NSRect windowFrame;
@implementation PluginWindowController
-
+{
+ NSWindow *fullWindow;
+}
+ (id)openGameView
{
if (gameWindow == nil) {
@@ -59,7 +61,7 @@ NSRect windowFrame;
- (PluginGLView *)openGLView
{
- return (PluginGLView *)glView;
+ return (PluginGLView *)self.glView;
}
- (void)dealloc
@@ -132,8 +134,8 @@ NSRect windowFrame;
screen:screen];
//[[glView openGLContext] setFullScreen];
- [[glView openGLContext] setView:[fullWindow contentView]];
- [glView reshape];
+ [[self.glView openGLContext] setView:[fullWindow contentView]];
+ [self.glView reshape];
//[[glView openGLContext] update];
//[fullWindow setContentView:glView];
@@ -156,8 +158,8 @@ NSRect windowFrame;
[fullWindow orderOut:self];
fullWindow = nil;
- [[glView openGLContext] setView:glView];
- [glView reshape];
+ [[self.glView openGLContext] setView:_glView];
+ [self.glView reshape];
//[window setContentView:glView];
}
@@ -178,7 +180,7 @@ NSRect windowFrame;
{
if (!(([sender resizeFlags] & NSShiftKeyMask) == NSShiftKeyMask)) {
NSRect oldSize = [sender frame];
- NSRect viewSize = [glView frame];
+ NSRect viewSize = [self.glView frame];
float xDiff = NSWidth(oldSize) - NSWidth(viewSize);
float yDiff = NSHeight(oldSize) - NSHeight(viewSize);