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

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
This commit is contained in:
Shawn Hoffman 2011-06-02 23:36:50 +00:00
parent bad9fd1f1d
commit 7e2adf6714
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

@ -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();