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

Get the status bar working in linux. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5011 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-02-05 04:22:48 +00:00
parent f4e8385973
commit 722488a0b3
2 changed files with 2 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

@ -623,10 +623,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
case IDM_UPDATESTATUSBAR: case IDM_UPDATESTATUSBAR:
if (m_pStatusBar != NULL) 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()); m_pStatusBar->SetStatusText(event.GetString(), event.GetInt());
#endif
} }
break; break;
} }

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

@ -663,7 +663,8 @@ void Host_UpdateStatusBar(const char* _pText, int Field)
event.StopPropagation(); event.StopPropagation();
main_frame->GetEventHandler()->AddPendingEvent(event); main_frame->GetEventHandler()->AddPendingEvent(event);
// Process the event before continue // Process the event before continue
wxGetApp().ProcessPendingEvents(); if (wxGetApp().Pending())
wxGetApp().ProcessPendingEvents();
} }
void Host_SetWiiMoteConnectionState(int _State) void Host_SetWiiMoteConnectionState(int _State)