Merge pull request #6098 from aleios/master
WX: Reshow cursor after game termination (issue 10503)
This commit is contained in:
commit
5f0de43828
|
@ -711,7 +711,6 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
|
|||
// To capture key events on Linux and Mac OS X the frame needs at least one child.
|
||||
m_render_parent = new wxPanel(m_render_frame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
|
||||
#endif
|
||||
|
||||
m_render_frame->Show();
|
||||
}
|
||||
|
||||
|
@ -760,6 +759,8 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
|
|||
wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this);
|
||||
wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this);
|
||||
m_render_parent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);
|
||||
|
||||
m_render_parent->SetCursor(wxCURSOR_BLANK);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -910,6 +911,9 @@ void CFrame::DoStop()
|
|||
return;
|
||||
}
|
||||
|
||||
// Reshow the cursor on the parent frame after successful stop.
|
||||
m_render_parent->SetCursor(wxNullCursor);
|
||||
|
||||
Core::Stop();
|
||||
UpdateGUI();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue