diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-26 05:03:11 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-26 05:03:11 +0000 |
| commit | 47617238d350c1a3aa7b0727928b2d28f9f7a859 (patch) | |
| tree | 8f3cdd949cdd32d5a25b1a4a8a087a055b49c7bc | |
| parent | 5b664c684367676c028adf91c1b64acaf8d434ab (diff) | |
| download | pcsxr-47617238d350c1a3aa7b0727928b2d28f9f7a859.tar.gz | |
Fix a missing [super dealloc] call.
Fixing wrong bindings.
I still get wrong info (it says some memory slots are deleted when they're not).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72647 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | macosx/English.lproj/MemCardManager.xib | 25 | ||||
| -rw-r--r-- | macosx/PcsxrMemoryObject.h | 6 | ||||
| -rw-r--r-- | macosx/PcsxrMemoryObject.m | 2 |
3 files changed, 25 insertions, 8 deletions
diff --git a/macosx/English.lproj/MemCardManager.xib b/macosx/English.lproj/MemCardManager.xib index ee129b4e..2cf97399 100644 --- a/macosx/English.lproj/MemCardManager.xib +++ b/macosx/English.lproj/MemCardManager.xib @@ -850,19 +850,34 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">hidden: deleted</string> + <string key="label">hidden: representedObject.deleted</string> <reference key="source" ref="552567303"/> <reference key="destination" ref="613808531"/> <object class="NSNibBindingConnector" key="connector"> <reference key="NSSource" ref="552567303"/> <reference key="NSDestination" ref="613808531"/> - <string key="NSLabel">hidden: deleted</string> + <string key="NSLabel">hidden: representedObject.deleted</string> <string key="NSBinding">hidden</string> - <string key="NSKeyPath">deleted</string> + <string key="NSKeyPath">representedObject.deleted</string> + <object class="NSDictionary" key="NSOptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSMultipleValuesPlaceholder</string> + <string>NSNotApplicablePlaceholder</string> + <string>NSNullPlaceholder</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + </object> + </object> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">80</int> + <int key="connectionID">86</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -1252,7 +1267,7 @@ <reference key="dict.values" ref="1002"/> </object> <nil key="sourceID"/> - <int key="maxID">80</int> + <int key="maxID">87</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h index a0681059..6c07a2d6 100644 --- a/macosx/PcsxrMemoryObject.h +++ b/macosx/PcsxrMemoryObject.h @@ -19,9 +19,9 @@ unsigned char memFlags; } -@property(copy, readwrite) NSString * englishName; -@property(copy, readwrite) NSString * sjisName; -@property(retain, readwrite) NSImage * memImage; +@property(copy, readwrite) NSString *englishName; +@property(copy, readwrite) NSString *sjisName; +@property(retain, readwrite) NSImage *memImage; @property(readwrite) BOOL deleted; @property(readwrite) short memNumber; @property(readwrite) unsigned char memFlags; diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index c8165a24..7a55c1b0 100644 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -22,6 +22,8 @@ [englishName release]; [sjisName release]; [memImage release]; + + [super dealloc]; } @end |