piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Tons of warning cleanup plus workaround a nasty crash problem in StatusBarMessage.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4234 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-09-08 21:16:05 +00:00
parent e3d505c631
commit 0a576c7508
29 changed files with 107 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,7 +630,10 @@ 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;
}

2
Source/Core/DolphinWX/Src/Frame.h
View File

@ -78,7 +78,7 @@ class CFrame : public wxFrame
void PostEvent(wxCommandEvent& event);
void PostMenuEvent(wxMenuEvent& event);
void PostUpdateUIEvent(wxUpdateUIEvent& event);
void StatusBarMessage(char * Text, ...);
void StatusBarMessage(const char * Text, ...);
void ClearStatusBar();
void OnCustomHostMessage(int Id);

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

@ -707,7 +707,8 @@ void CFrame::ClearStatusBar()
{
if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(wxT(""),0);
}
void CFrame::StatusBarMessage(char * Text, ...)
void CFrame::StatusBarMessage(const char * Text, ...)
{
const int MAX_BYTES = 1024*10;
char Str[MAX_BYTES];