From fda7db4491a0c1620afcd50d7f53985442c6e856 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sat, 6 Jul 2013 03:02:24 +0000
Subject: Minor OS X changes.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85869 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/PcsxrMemoryObject.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'macosx/PcsxrMemoryObject.h')

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;
-- 
cgit v1.2.3