From 722488a0b33e0c54611ebfa01a87d391c0e26266 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 5 Feb 2010 04:22:48 +0000 Subject: [PATCH] Get the status bar working in linux. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5011 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.cpp | 3 --- Source/Core/DolphinWX/Src/Main.cpp | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 76b2aa1c92..085202c069 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -623,10 +623,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event) case IDM_UPDATESTATUSBAR: if (m_pStatusBar != NULL) { - // Linux doesn't like it since the message isn't coming from the GUI thread. We need to change this to post a message to the Frame. -#ifdef _WIN32 m_pStatusBar->SetStatusText(event.GetString(), event.GetInt()); -#endif } break; } diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index e1feabd77d..0e5ccbc2a8 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -663,7 +663,8 @@ void Host_UpdateStatusBar(const char* _pText, int Field) event.StopPropagation(); main_frame->GetEventHandler()->AddPendingEvent(event); // Process the event before continue - wxGetApp().ProcessPendingEvents(); + if (wxGetApp().Pending()) + wxGetApp().ProcessPendingEvents(); } void Host_SetWiiMoteConnectionState(int _State)