From: <rog...@us...> - 2012-10-21 05:42:28
|
Revision: 4409 http://desmume.svn.sourceforge.net/desmume/?rev=4409&view=rev Author: rogerman Date: 2012-10-21 05:42:21 +0000 (Sun, 21 Oct 2012) Log Message: ----------- Cocoa Port: - Remove code for Eject Card functionality. (Function is currently unimplemented, and has been obsoleted in r4392.) Revision Links: -------------- http://desmume.svn.sourceforge.net/desmume/?rev=4392&view=rev Modified Paths: -------------- trunk/desmume/src/cocoa/cocoa_core.h trunk/desmume/src/cocoa/cocoa_core.mm trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm Modified: trunk/desmume/src/cocoa/cocoa_core.h =================================================================== --- trunk/desmume/src/cocoa/cocoa_core.h 2012-10-21 00:08:42 UTC (rev 4408) +++ trunk/desmume/src/cocoa/cocoa_core.h 2012-10-21 05:42:21 UTC (rev 4409) @@ -109,7 +109,6 @@ - (BOOL) ejectCardFlag; - (void) setEjectCardFlag; -- (void) toggleEjectCard; - (void) changeRomSaveType:(NSInteger)saveTypeID; - (void) changeExecutionSpeed; Modified: trunk/desmume/src/cocoa/cocoa_core.mm =================================================================== --- trunk/desmume/src/cocoa/cocoa_core.mm 2012-10-21 00:08:42 UTC (rev 4408) +++ trunk/desmume/src/cocoa/cocoa_core.mm 2012-10-21 05:42:21 UTC (rev 4409) @@ -590,12 +590,6 @@ return NO; } -- (void) toggleEjectCard -{ - NDS_ToggleCardEject(); - [self setEjectCardFlag]; -} - - (void) changeRomSaveType:(NSInteger)saveTypeID { pthread_mutex_lock(self.mutexCoreExecute); Modified: trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h =================================================================== --- trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h 2012-10-21 00:08:42 UTC (rev 4408) +++ trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h 2012-10-21 05:42:21 UTC (rev 4409) @@ -144,7 +144,6 @@ - (IBAction) speedLimitDisable:(id)sender; - (IBAction) toggleAutoFrameSkip:(id)sender; - (IBAction) cheatsDisable:(id)sender; -- (IBAction) ejectCard:(id)sender; - (IBAction) executeCoreToggle:(id)sender; - (IBAction) resetCore:(id)sender; - (IBAction) changeRomSaveType:(id)sender; Modified: trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm =================================================================== --- trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm 2012-10-21 00:08:42 UTC (rev 4408) +++ trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm 2012-10-21 05:42:21 UTC (rev 4409) @@ -788,13 +788,6 @@ } } -- (IBAction) ejectCard:(id)sender -{ - CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content]; - - [cdsCore toggleEjectCard]; -} - // View Menu - (IBAction) changeCoreSpeed:(id)sender @@ -1529,23 +1522,6 @@ enable = NO; } } - else if (theAction == @selector(ejectCard:)) - { - if (![self isRomLoaded]) - { - enable = NO; - } - - if ([cdsCore ejectCardFlag]) - { - [(NSMenuItem*)theItem setState:NSOnState]; - } - else - { - [(NSMenuItem*)theItem setState:NSOffState]; - } - - } else if (theAction == @selector(_openRecentDocument:)) { if ([self isShowingSaveStateSheet]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |