OS X:

Stop the memory card images from animating when the preferences window closes.
Other changes and improvements.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89782 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 7 insertions, 35 deletions

diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.h b/macosx/plugins/DFInput/macsrc/MappingCell.h
index 58ebc7e1..d85100d3 100755
--- a/macosx/plugins/DFInput/macsrc/MappingCell.h
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.h
@@ -21,7 +21,7 @@
 
 #define MappingCell NetPcsxrHIDInputPluginMappingCell
 
-#import <AppKit/AppKit.h>
+#import <Cocoa/Cocoa.h>
 
 @interface MappingCell : NSTextFieldCell
 
diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
index 5c73971b..f1b2cf3c 100644
--- a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
+++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsSoftGPUPluginWindowController">
@@ -13,9 +13,8 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application"/>
-        <window title="PeopsOpenGL Display" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="NetSfPeopsOpenGLGPUPluginWindow">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+        <window title="PeopsOpenGL Display" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="NetSfPeopsOpenGLGPUPluginWindow">
+            <windowStyleMask key="styleMask" closable="YES" resizable="YES"/>
             <rect key="contentRect" x="108" y="331" width="640" height="480"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <value key="minSize" type="size" width="213" height="107"/>
@@ -34,4 +33,4 @@
             </connections>
         </window>
     </objects>
-</document>
\ No newline at end of file
+</document>
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
index ddeae10b..c2e232cb 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
@@ -18,7 +18,6 @@
  
  /* this is a borderless window that can be dragged about. Also, holds a GLView */
 #import <Cocoa/Cocoa.h>
-#import <AppKit/NSMenu.h>
 
 @interface NetSfPeopsOpenGLGPUPluginWindow : NSWindow
 {
@@ -26,12 +25,6 @@
     NSPoint initialLocation;
 }
 
-- (id) initWithContentRect: (NSRect) contentRect
-                 styleMask: (NSUInteger) aStyle
-                   backing: (NSBackingStoreType) bufferingType
-                     defer: (BOOL) flag ;
-
-
 - (BOOL) canBecomeKeyWindow; // to stop the beeping
 
 - (void) sendEvent:(NSEvent *)theEvent;
@@ -46,8 +39,5 @@
 - (void)keyDown:(NSEvent *)theEvent;
 - (void)keyUp:(NSEvent *)theEvent;
 
-@end
-
-@interface NetSfPeopsOpenGLGPUPluginWindow (NSMenuValidation) 
 - (BOOL)validateMenuItem:(NSMenuItem*) item;
 @end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
index 8e202933..990495ec 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
@@ -42,22 +42,6 @@
 	[super sendEvent:theEvent];
 }
 
-- (id) initWithContentRect: (NSRect) contentRect
-                 styleMask: (NSUInteger) aStyle
-                   backing: (NSBackingStoreType) bufferingType
-                     defer: (BOOL) flag
-{
-    if (self = [super initWithContentRect: contentRect
-                                styleMask: NSBorderlessWindowMask
-                                  backing: bufferingType
-                                    defer: flag])
-    {
-    return self;
-    }
-
-    return nil;
-}
-
 - (void) windowDidResize:(NSNotification*)notice
 {
 }
@@ -116,7 +100,6 @@
 
 }
 
- 
 
 /*