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

Clean up WX style issues mentionned in previous commits comments

Browse Source
This commit is contained in:
Pierre Bourdon
2012-08-06 14:21:49 +02:00
parent 0efd4e5c29
commit a2b71f1ed7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -797,7 +797,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
bool IsHotkey(wxKeyEvent &event, int Id) bool IsHotkey(wxKeyEvent &event, int Id)
{ {
return (event.GetKeyCode() && return (event.GetKeyCode() != WXK_NONE &&
event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
} }

2
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -669,7 +669,7 @@ void CFrame::DoOpen(bool Boot)
wxFD_OPEN | wxFD_FILE_MUST_EXIST, wxFD_OPEN | wxFD_FILE_MUST_EXIST,
this); this);
if (path.empty()) if (path.IsEmpty())
return; return;
std::string currentDir2 = File::GetCurrentDir(); std::string currentDir2 = File::GetCurrentDir();