diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-08-06 14:21:49 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-08-06 14:21:49 +0200 |
| commit | a2b71f1ed7d1c3dcd43334e829b70aa53a9f6bf5 (patch) | |
| tree | 2f8862762040618f103e9d0a573792636c0d299a /Source/Core | |
| parent | 0efd4e5c29766ba5f5d22204339637ade9ccec83 (diff) | |
Clean up WX style issues mentionned in previous commits comments
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 3efc26610b..6b0e7b7678 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -797,7 +797,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) bool IsHotkey(wxKeyEvent &event, int Id) { - return (event.GetKeyCode() && + return (event.GetKeyCode() != WXK_NONE && event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); } diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index a42e76bee6..d24bd2f23e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -669,7 +669,7 @@ void CFrame::DoOpen(bool Boot) wxFD_OPEN | wxFD_FILE_MUST_EXIST, this); - if (path.empty()) + if (path.IsEmpty()) return; std::string currentDir2 = File::GetCurrentDir(); |