From a96ba176322566d9d15b51c714984affcdfc6355 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Mon, 10 Nov 2014 20:22:50 +0000 Subject: 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 --- macosx/plugins/DFXVideo/macsrc/PluginWindowController.m | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'macosx/plugins/DFXVideo/macsrc/PluginWindowController.m') 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); -- cgit v1.2.3