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

Some clean up in io_osx.m, the if not confused me in the SConscript. I made the frames work with WX 2.9. Disabled rumble in Wiimote in OSX. Wiimote MAY work in Dolphin in OSX, not 100% sure. Made a test app and it works in that. Couldn't build a WX build of Dolphin in OSX because Macports doesn't compile in AUI apparently

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4904 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2010-01-20 11:49:11 +00:00
parent f76e9db1a7
commit 40ac160f37
6 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,11 +490,11 @@ void Host_Message(int Id)
void Host_NotifyMapLoaded()
{
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_NOTIFYMAPLOADED);
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
if (main_frame->g_pCodeWindow)
{
main_frame->g_pCodeWindow->AddPendingEvent(event);
main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
}
}
@ -502,11 +502,11 @@ void Host_NotifyMapLoaded()
void Host_UpdateLogDisplay()
{
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATELOGDISPLAY);
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
if (main_frame->g_pCodeWindow)
{
main_frame->g_pCodeWindow->AddPendingEvent(event);
main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
}
}
@ -514,11 +514,11 @@ void Host_UpdateLogDisplay()
void Host_UpdateDisasmDialog()
{
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEDISASMDIALOG);
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
if (main_frame->g_pCodeWindow)
{
main_frame->g_pCodeWindow->AddPendingEvent(event);
main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
}
}
@ -531,22 +531,22 @@ void Host_ShowJitResults(unsigned int address)
void Host_UpdateMainFrame()
{
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
if (main_frame->g_pCodeWindow)
{
main_frame->g_pCodeWindow->AddPendingEvent(event);
main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
}
}
void Host_UpdateBreakPointView()
{
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEBREAKPOINTS);
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
if (main_frame->g_pCodeWindow)
{
main_frame->g_pCodeWindow->AddPendingEvent(event);
main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
}
}
@ -623,7 +623,7 @@ void Host_UpdateStatusBar(const char* _pText, int Field)
// Post message
// TODO : this has been said to cause hang (??) how is that even possible ? :d
event.StopPropagation();
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
// Process the event before continue
wxGetApp().ProcessPendingEvents();
}
@ -646,6 +646,6 @@ void Host_SetWiiMoteConnectionState(int _State)
// Update field 1 or 2
event.SetInt(1);
main_frame->AddPendingEvent(event);
main_frame->GetEventHandler()->AddPendingEvent(event);
}
#endif // HAVE_WX