diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/Src/IPC_HLE/l2cap.h index a3cff02187..e240dafd8d 100644 --- a/Source/Core/Core/Src/IPC_HLE/l2cap.h +++ b/Source/Core/Core/Src/IPC_HLE/l2cap.h @@ -68,17 +68,7 @@ #pragma once -// msvc >= msvc10 has stdint.h/cstdint -#ifdef _MSC_VER - typedef u8 uint8_t; - typedef s8 int8_t; - typedef u16 uint16_t; - typedef s16 int16_t; - typedef u32 uint32_t; - typedef s32 int32_t; -#else - #include -#endif +#include /************************************************************************** ************************************************************************** diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index ca8f5f7598..7c48bbcdee 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -165,10 +165,7 @@ wxAuiToolBar *CCodeWindow::GetToolBar() void CCodeWindow::OnKeyDown(wxKeyEvent& event) { - if (event.GetKeyCode() == WXK_SPACE && event.GetModifiers() == wxMOD_NONE) - SingleStep(); - else - event.Skip(); + event.Skip(); } void CCodeWindow::OnHostMessage(wxCommandEvent& event) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index f46765f72e..4a12d72a0a 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -643,10 +643,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event) case IDM_UPDATESTATUSBAR: if (GetStatusBar() != NULL) - { GetStatusBar()->SetStatusText(event.GetString(), event.GetInt()); - UpdateGUI(); - } break; case IDM_UPDATETITLE: