diff --git a/desmume/src/cocoa/cocoa_core.h b/desmume/src/cocoa/cocoa_core.h index 2fd64396b..9fe5a9cc3 100644 --- a/desmume/src/cocoa/cocoa_core.h +++ b/desmume/src/cocoa/cocoa_core.h @@ -109,7 +109,6 @@ typedef struct - (BOOL) ejectCardFlag; - (void) setEjectCardFlag; -- (void) toggleEjectCard; - (void) changeRomSaveType:(NSInteger)saveTypeID; - (void) changeExecutionSpeed; diff --git a/desmume/src/cocoa/cocoa_core.mm b/desmume/src/cocoa/cocoa_core.mm index 976af7334..cd696a5ce 100644 --- a/desmume/src/cocoa/cocoa_core.mm +++ b/desmume/src/cocoa/cocoa_core.mm @@ -590,12 +590,6 @@ static BOOL isCoreStarted = NO; return NO; } -- (void) toggleEjectCard -{ - NDS_ToggleCardEject(); - [self setEjectCardFlag]; -} - - (void) changeRomSaveType:(NSInteger)saveTypeID { pthread_mutex_lock(self.mutexCoreExecute); diff --git a/desmume/src/cocoa/userinterface/emuWindowDelegate.h b/desmume/src/cocoa/userinterface/emuWindowDelegate.h index deacfeada..7ec3754a1 100644 --- a/desmume/src/cocoa/userinterface/emuWindowDelegate.h +++ b/desmume/src/cocoa/userinterface/emuWindowDelegate.h @@ -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; diff --git a/desmume/src/cocoa/userinterface/emuWindowDelegate.mm b/desmume/src/cocoa/userinterface/emuWindowDelegate.mm index ff4324aa2..3366416ea 100644 --- a/desmume/src/cocoa/userinterface/emuWindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/emuWindowDelegate.mm @@ -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])