ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
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. 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,9 +56,8 @@
#include <wx/datetime.h> // wxWidgets
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Aui events
// ｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯ
void CFrame::OnManagerResize(wxAuiManagerEvent& event)
{
@ -196,12 +195,10 @@ void CFrame::ToggleConsole(bool _show, int i)
// Make sure the check is updated (if wxw isn't calling this func)
//GetMenuBar()->FindItem(IDM_CONSOLEWINDOW)->Check(Show);
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Notebooks
// ｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯ
void CFrame::ClosePages()
{
DoToggleWindow(IDM_LOGWINDOW, false);
@ -648,14 +645,10 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
break;
}
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Functions
// ｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯ
void CFrame::ResetToolbarStyle()
{
@ -1054,14 +1047,10 @@ void CFrame::AddPane()
AddRemoveBlankPage();
m_Mgr->Update();
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Utility
// ｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯ
int CFrame::Limit(int i, int Low, int High)
{
@ -1266,5 +1255,4 @@ void CFrame::HideAllNotebooks(bool Window)
}
}
m_Mgr->Update();
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
}

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

@ -42,9 +42,9 @@
#include "BootManager.h"
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ------------
// Main window
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
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
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
// g_VideoInitialize.pSysMessage() goes here
void Host_SysMessage(const char *fmt, ...)
@ -452,7 +451,7 @@ void Host_UpdateBreakPointView()
// Update Wiimote status bar
// ¯¯¯¯¯¯¯¯¯¯¯¯¯
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

6
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -381,9 +381,12 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
buffer = ">> "+m_nick+" is now Unready !\n";
m_ready = !m_ready;
m_Disconnect->Enable(!(m_ready));
if (m_isHosting == 1)
{
m_ChangeGame->Enable(!(m_ready));
if (m_numClients > 0)
{
int buffer_size = (int)buffer.size();
@ -460,8 +463,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
// TODO : there seems to be a random bug here that i can't reproduce... looked like a loop bug :/
wxString chat_str = wxString::Format(wxT("> %s : %s\n"), wxString(m_nick.c_str(), wxConvUTF8).c_str() , m_Chat->GetValue().c_str() );
int chat_size = (int)chat_str.size();
int nick_size = m_nick.size();
if(chat_size-nick_size-6 > 0)
if(chat_size-m_nick.size()-6 > 0)
{
m_Chat->Clear();

2
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -289,7 +289,6 @@ bool Renderer::Init()
}
// Decide frambuffer size
// ｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯ
int W = (int)OpenGL_GetBackbufferWidth(), H = (int)OpenGL_GetBackbufferHeight();
if (g_Config.bNativeResolution)
{
@ -321,7 +320,6 @@ bool Renderer::Init()
// Disable the 2x option
if (!g_Config.b2xResolution && (W < 1280 || H < 960)) g_Config.bAllow2xResolution = false;
// ｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯｯ
if (GL_REPORT_ERROR() != GL_NO_ERROR)
bSuccess = false;