archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2641 from comex/trivial-fixes

Browse source 
Trivial fixes
This commit is contained in:
comex 2015-06-21 15:51:25 -04:00
commit f6d27a5ce8
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -469,7 +469,7 @@ if(NOT ANDROID)
if(ENCODE_FRAMEDUMPS)
check_libav()
if(LIBAV_FOUND)
LIST(APPEND LIBS ${LIBAV_LIBRARIES})
LIST(APPEND LIBS ${LIBAV_LDFLAGS})
endif()
endif()
@ -781,7 +781,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
endif()
include_directories(
include_directories(SYSTEM
Externals/wxWidgets3
Externals/wxWidgets3/include)
add_subdirectory(Externals/wxWidgets3)

4
Source/Core/DolphinWX/ControllerConfigDiag.cpp
View file

@ -43,7 +43,7 @@ wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
{
m_gc_pad_type_strs = {
m_gc_pad_type_strs = {{
_("None"),
_("Standard Controller"),
_("Steering Wheel"),
@ -52,7 +52,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
_("GBA"),
_("Keyboard"),
_("AM-Baseboard")
};
}};
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);

2
Source/Core/DolphinWX/Main.cpp
View file

@ -276,12 +276,14 @@ bool DolphinApp::OnInit()
return true;
}
#ifdef __APPLE__
void DolphinApp::MacOpenFile(const wxString &fileName)
{
FileToLoad = fileName;
LoadFile = true;
main_frame->BootGame(WxStrToStr(FileToLoad));
}
#endif
void DolphinApp::AfterInit()
{

4
Source/Core/DolphinWX/Main.h
View file

@ -23,7 +23,9 @@ private:
void OnFatalException() override;
bool Initialize(int& c, wxChar **v) override;
void InitLanguageSupport();
void MacOpenFile(const wxString &fileName);
#ifdef __APPLE__
void MacOpenFile(const wxString &fileName) override;
#endif
bool BatchMode;
bool LoadFile;

6
Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
View file

@ -57,9 +57,9 @@ public:
Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
std::string GetName() const;
std::string GetSource() const;
int GetId() const;
std::string GetName() const override;
std::string GetSource() const override;
int GetId() const override;
private:
struct