summaryrefslogtreecommitdiff
path: root/macosx/PcsxrMemoryObject.h
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-06 03:02:24 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-06 03:02:24 +0000
commitfda7db4491a0c1620afcd50d7f53985442c6e856 (patch)
tree0d6693a5c38149cda109e6839de2a7879221e130 /macosx/PcsxrMemoryObject.h
parentea22cb43790add304b8b3620e45fe4a8e7b719c2 (diff)
downloadpcsxr-fda7db4491a0c1620afcd50d7f53985442c6e856.tar.gz
Minor OS X changes.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85869 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrMemoryObject.h')
-rwxr-xr-xmacosx/PcsxrMemoryObject.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index 985a64b3..92ae447f 100755
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -8,6 +8,7 @@
#import <Foundation/NSObject.h>
#include "sio.h"
+#import "ARCBridge.h"
@class NSImage;
@class NSString;
@@ -21,7 +22,7 @@ extern NSString *const memoryAnimateTimerKey;
NSString *sjisName;
NSString *memName;
NSString *memID;
- NSImage *memImage;
+ NSInteger memImageIndex;
NSArray *memImages;
BOOL notDeleted;
unsigned char memFlags;
@@ -30,11 +31,11 @@ extern NSString *const memoryAnimateTimerKey;
- (id)initWithMcdBlock:(McdBlock *)infoBlock;
-@property (readonly, retain) NSString *englishName;
-@property (readonly, retain) NSString *sjisName;
-@property (readonly, retain) NSString *memName;
-@property (readonly, retain) NSString *memID;
-@property (readonly, retain) NSImage *memImage;
+@property (readonly, arcstrong) NSString *englishName;
+@property (readonly, arcstrong) NSString *sjisName;
+@property (readonly, arcstrong) NSString *memName;
+@property (readonly, arcstrong) NSString *memID;
+@property (readonly, unsafe_unretained, nonatomic) NSImage *memImage;
@property (readonly) int memIconCount;
@property (readonly, getter = isNotDeleted) BOOL notDeleted;
@property (readonly) unsigned char memFlags;