diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-02 18:01:28 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-02 18:01:28 +0000 |
| commit | ebc8e55d33f011d9c44a5c76f463c99950f0e973 (patch) | |
| tree | 715e11e8bff5125725a1600efbf3a4912b958a82 /macosx/PcsxrMemoryObject.m | |
| parent | 761714b617e99eaa5009ccf73e637367c41e3bb2 (diff) | |
| download | pcsxr-ebc8e55d33f011d9c44a5c76f463c99950f0e973.tar.gz | |
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
Diffstat (limited to 'macosx/PcsxrMemoryObject.m')
| -rwxr-xr-x | macosx/PcsxrMemoryObject.m | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index a54cc7a5..55753914 100755 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -6,13 +6,8 @@ // Copyright (c) 2011 __MyCompanyName__. All rights reserved. // +#import <Cocoa/Cocoa.h> #import "PcsxrMemoryObject.h" -#import <Foundation/NSString.h> -#import <Foundation/NSArray.h> -#import <AppKit/NSColor.h> -#import <AppKit/NSImage.h> -#import <AppKit/NSBezierPath.h> -#import <AppKit/NSAttributedString.h> NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate"; @@ -225,7 +220,7 @@ static NSString *MemLabelEndLink; return [PcsxrMemoryObject memoryLabelFromFlag:flagNameIndex]; } -NS_INLINE void SetupAttrStr(NSMutableAttributedString *mutStr, NSColor *txtclr) +static inline void SetupAttrStr(NSMutableAttributedString *mutStr, NSColor *txtclr) { NSRange wholeStrRange = NSMakeRange(0, mutStr.string.length); [mutStr addAttribute:NSFontAttributeName value:[NSFont userFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]] range:wholeStrRange]; |