piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4227 from ligfx/clean_objc

Browse Source 
Don't force compile everything as Objective-C++ on macOS
This commit is contained in:
shuffle2
2016-10-02 19:42:04 -07:00
committed by GitHub
parent ccfc081697 cd19c9fa22
commit 8fcc3b04e0
13 changed files with 89 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -2,10 +2,6 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#ifdef __APPLE__
#import <Cocoa/Cocoa.h>
#endif
#include <cinttypes>
#include <cstddef>
#include <cstdio>
@ -1235,9 +1231,9 @@ bool CISOProperties::SaveGameConfig()
void CISOProperties::LaunchExternalEditor(const std::string& filename, bool wait_until_closed)
{
#ifdef __APPLE__
// wxTheMimeTypesManager is not yet implemented for wxCocoa
[[NSWorkspace sharedWorkspace] openFile:[NSString stringWithUTF8String:filename.c_str()]
withApplication:@"TextEdit"];
// GetOpenCommand does not work for wxCocoa
const char* OpenCommandConst[] = {"open", "-a", "TextEdit", filename.c_str(), NULL};
char** OpenCommand = const_cast<char**>(OpenCommandConst);
#else
wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension("ini");
if (filetype == nullptr) // From extension failed, trying with MIME type now
@ -1256,6 +1252,7 @@ void CISOProperties::LaunchExternalEditor(const std::string& filename, bool wait
WxUtils::ShowErrorDialog(_("Couldn't find open command for extension 'ini'!"));
return;
}
#endif
long result;
@ -1269,7 +1266,6 @@ void CISOProperties::LaunchExternalEditor(const std::string& filename, bool wait
WxUtils::ShowErrorDialog(_("wxExecute returned -1 on application run!"));
return;
}
#endif
}
void CISOProperties::GenerateLocalIniModified()