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

NETPLAY:Changed it so if your set to ready the disconnect button is greyed out if your host the change game button is also greyed out.

Browse Source 
OTHER:Some other misc ///////////'s clean up.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4207 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid
2009-09-06 01:40:44 +00:00
parent eb9f6cd7a1
commit 8b2d991be4
4 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,9 @@
#include "BootManager.h"
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Main window
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
IMPLEMENT_APP(DolphinApp)
#if defined(HAVE_WX) && HAVE_WX
@ -308,9 +308,9 @@ bool DolphinApp::OnInit()
wxPoint(100, 100), wxSize(800, 600), false, UseLogger);
}
// ---------------------------------------------------
// ------------
// Check the autoboot options.
// ---------------------
// First check if we have a elf command line. Todo: Should we place this under #if wxUSE_CMDLINE_PARSER?
if (LoadElf && ElfFile != wxEmptyString)
{
@ -348,12 +348,11 @@ void DolphinApp::OnEndSession()
{
SConfig::GetInstance().SaveSettings();
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Talk to GUI
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// g_VideoInitialize.pSysMessage() goes here
void Host_SysMessage(const char *fmt, ...)
@ -452,7 +451,7 @@ void Host_UpdateBreakPointView()
// Update Wiimote status bar
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
void Host_UpdateLeds(int led_bits)
{
// Convert it to a simpler byte format
@ -551,5 +550,4 @@ void Host_SetWiiMoteConnectionState(int _State)
wxPostEvent(main_frame, event);
}
#endif // HAVE_WX
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#endif // HAVE_WX