ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2641 from comex/trivial-fixes 

Trivial fixes
This commit is contained in:
comex 2015-06-21 15:51:25 -04:00
parent b0bc60d58a 4b06089103
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) if(ENCODE_FRAMEDUMPS)
check_libav() check_libav()
if(LIBAV_FOUND) if(LIBAV_FOUND)
LIST(APPEND LIBS ${LIBAV_LIBRARIES}) LIST(APPEND LIBS ${LIBAV_LDFLAGS})
endif() endif()
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") message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
endif() endif()
include_directories( include_directories(SYSTEM
Externals/wxWidgets3 Externals/wxWidgets3
Externals/wxWidgets3/include) Externals/wxWidgets3/include)
add_subdirectory(Externals/wxWidgets3) 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) ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration")) : wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
{ {
m_gc_pad_type_strs = { m_gc_pad_type_strs = {{
_("None"), _("None"),
_("Standard Controller"), _("Standard Controller"),
_("Steering Wheel"), _("Steering Wheel"),
@ -52,7 +52,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
_("GBA"), _("GBA"),
_("Keyboard"), _("Keyboard"),
_("AM-Baseboard") _("AM-Baseboard")
}; }};
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);

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

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

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

@ -23,7 +23,9 @@ private:
void OnFatalException() override; void OnFatalException() override;
bool Initialize(int& c, wxChar **v) override; bool Initialize(int& c, wxChar **v) override;
void InitLanguageSupport(); void InitLanguageSupport();
void MacOpenFile(const wxString &fileName); #ifdef __APPLE__
void MacOpenFile(const wxString &fileName) override;
#endif
bool BatchMode; bool BatchMode;
bool LoadFile; 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); Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
std::string GetName() const; std::string GetName() const override;
std::string GetSource() const; std::string GetSource() const override;
int GetId() const; int GetId() const override;
private: private:
struct struct