Some more work on making dialogs close when escape is pressed. Also make sure dialog modality is ended properly so that they can be closed on OSX.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7352 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-03-15 21:57:00 +00:00
parent f26a7288a7
commit e77059d30c
8 changed files with 42 additions and 71 deletions

View File

@ -32,7 +32,6 @@
#include "Frame.h"
#include "ConfigMain.h"
#include "CheatsWindow.h"
#include "AboutDolphin.h"
#include "GameListCtrl.h"
#include "BootManager.h"
#include "ConsoleListener.h"
@ -870,7 +869,8 @@ int GetCmdForHotkey(unsigned int key)
void CFrame::OnKeyDown(wxKeyEvent& event)
{
if(Core::GetState() != Core::CORE_UNINITIALIZED)
if(Core::GetState() != Core::CORE_UNINITIALIZED &&
RendererHasFocus())
{
int WiimoteId = -1;
// Toggle fullscreen