From 7e2adf67144e636461dd43b46aabe908d6027626 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 2 Jun 2011 23:36:50 +0000 Subject: [PATCH] fix wxw errors: sliders being unresponsive during emulation. Fixes issue 4496. wxw complaining about non-stock menuitem without text (sysmenu menuitem). git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7579 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.cpp | 3 +-- Source/Core/DolphinWX/Src/FrameTools.cpp | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index f58fd4f1c5..51c1f83f9b 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -992,9 +992,8 @@ void CFrame::OnMouse(wxMouseEvent& event) X11Utils::SendButtonEvent(X11Utils::XDisplayFromHandle(GetHandle()), event.GetButton(), event.GetPosition().x, event.GetPosition().y, event.ButtonDown()); } -#else - (void)event; #endif + event.Skip(); } void CFrame::DoFullscreen(bool bF) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index b4981c0d53..462baffc46 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -205,7 +205,7 @@ void CFrame::CreateMenu() toolsMenu->Append(IDM_NETPLAY, _("Start &NetPlay")); toolsMenu->Append(IDM_MENU_INSTALLWAD, _("Install WAD")); - UpdateWiiMenuChoice(toolsMenu->Append(IDM_LOAD_WII_MENU)); + UpdateWiiMenuChoice(toolsMenu->Append(IDM_LOAD_WII_MENU, wxT("Dummy string to keep wxw happy"))); toolsMenu->Append(IDM_FIFOPLAYER, _("Fifo Player")); @@ -946,7 +946,7 @@ void CFrame::StartGame(const std::string& filename) #else m_RenderParent->SetFocus(); #endif - + wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard wxKeyEventHandler(CFrame::OnKeyDown), (wxObject*)0, this); @@ -971,6 +971,7 @@ void CFrame::StartGame(const std::string& filename) m_RenderParent->Connect(wxID_ANY, wxEVT_SIZE, wxSizeEventHandler(CFrame::OnRenderParentResize), (wxObject*)0, this); + } wxEndBusyCursor();