From de13f7dcbaa84255fa578aafe862f90c46225a01 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Wed, 21 Aug 2013 23:19:04 +0000 Subject: Fix OS X 10.8-only behavior in the XGL plug-in. Remove some commented-out code on Cocoa code. Change some ints passed in Cocoa code to NSIntegers. Replace a deprecated function call to NSRunAlertPanelRelativeToWindow. Other minor fixes and improvements. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86808 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/PcsxrMemoryObject.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'macosx/PcsxrMemoryObject.h') diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h index e84b15d5..0e2e79d2 100755 --- a/macosx/PcsxrMemoryObject.h +++ b/macosx/PcsxrMemoryObject.h @@ -32,27 +32,27 @@ typedef enum _PCSXRMemFlags { NSString *memName; NSString *memID; - NSArray *memImages; - NSInteger memImageIndex; - int startingIndex; - int blockSize; - PCSXRMemFlags flagNameIndex; + NSArray *memImages; + NSInteger memImageIndex; + uint8_t startingIndex; + uint8_t blockSize; + PCSXRMemFlags flagNameIndex; } + (NSArray *)imagesFromMcd:(McdBlock *)block; + (NSString*)memoryLabelFromFlag:(PCSXRMemFlags)flagNameIndex; + (NSImage *)blankImage; + (PCSXRMemFlags)memFlagsFromBlockFlags:(unsigned char)blockFlags; -- (id)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(int)startIdx; -- (id)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(int)startIdx size:(int)memSize; +- (id)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(uint8_t)startIdx; +- (id)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(uint8_t)startIdx size:(uint8_t)memSize; @property (readonly, arcstrong) NSString *englishName; @property (readonly, arcstrong) NSString *sjisName; @property (readonly, arcstrong) NSString *memName; @property (readonly, arcstrong) NSString *memID; @property (readonly) PCSXRMemFlags flagNameIndex; -@property (readonly) int startingIndex; -@property (readonly) int blockSize; +@property (readonly) uint8_t startingIndex; +@property (readonly) uint8_t blockSize; @property (readonly, unsafe_unretained, nonatomic) NSImage *memImage; @property (readonly, nonatomic) unsigned memIconCount; -- cgit v1.2.3