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

wxgui: minor code cleanups. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1530 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-07-16 10:25:24 +00:00
parent 657660371c
commit bea9aa2d15
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/gui/ConsoleLogger.cpp
View File

@ -176,6 +176,7 @@ void ConsoleLogFrame::OnMoveAround( wxMoveEvent& evt )
g_Conf->ConLogBox.AutoDock = true; g_Conf->ConLogBox.AutoDock = true;
} }
} }
g_Conf->ConLogBox.DisplayPosition = GetPosition();
evt.Skip(); evt.Skip();
} }
@ -289,6 +290,8 @@ void ConsoleLogFrame::Write( const wxString& text )
m_TextCtrl.AppendText( text ); m_TextCtrl.AppendText( text );
} }
//////////////////////////////////////////////////////////////////////////////////////////
namespace Console namespace Console
{ {
__threadlocal Colors th_CurrentColor = Color_Black; __threadlocal Colors th_CurrentColor = Color_Black;

0
pcsx2/gui/AboutBoxDialog.cpp → pcsx2/gui/Dialogs/AboutBoxDialog.cpp
View File

0
pcsx2/gui/LogOptionsDialog.cpp → pcsx2/gui/Dialogs/LogOptionsDialog.cpp
View File

0
pcsx2/gui/LogOptionsDialog.h → pcsx2/gui/Dialogs/LogOptionsDialog.h
View File

12
pcsx2/gui/MainFrame.cpp
View File

@ -18,7 +18,7 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "MainFrame.h" #include "MainFrame.h"
#include "LogOptionsDialog.h" #include "Dialogs/LogOptionsDialog.h"
#include "Dialogs/ModalPopups.h" #include "Dialogs/ModalPopups.h"
#include "Resources/EmbeddedImage.h" #include "Resources/EmbeddedImage.h"
@ -161,7 +161,7 @@ void MainEmuFrame::PopulatePadMenu()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Close out the console log windows along with the main emu window. // Close out the console log windows along with the main emu window.
// Note: This event only happens after a close event has occured and was *not* veto'd. Ie, // Note: This event only happens after a close event has occurred and was *not* veto'd. Ie,
// it means it's time to provide an unconditional closure of said window. // it means it's time to provide an unconditional closure of said window.
// //
void MainEmuFrame::OnCloseWindow(wxCloseEvent& evt) void MainEmuFrame::OnCloseWindow(wxCloseEvent& evt)
@ -176,13 +176,15 @@ void MainEmuFrame::OnMoveAround( wxMoveEvent& evt )
{ {
if( g_Conf->ConLogBox.AutoDock ) if( g_Conf->ConLogBox.AutoDock )
{ {
g_Conf->ConLogBox.DisplayPosition = GetPosition() + wxSize( GetSize().x, 0 ); g_Conf->ConLogBox.DisplayPosition = GetRect().GetTopRight();
// Send the move event our window ID, which allows the logbox to know that this // Send the move event our window ID, which allows the logbox to know that this
// move event comes from us, and needs a special handler. // move event comes from us, and needs a special handler.
wxCommandEvent evt( wxEVT_DockConsole ); wxCommandEvent evt( wxEVT_DockConsole );
wxGetApp().ConsoleLog_PostEvent( evt ); wxGetApp().ConsoleLog_PostEvent( evt );
} }
g_Conf->MainGuiPosition = GetPosition();
//evt.Skip(); //evt.Skip();
} }
@ -462,7 +464,7 @@ void MainEmuFrame::Menu_Debug_MemoryDump_Click(wxCommandEvent &event)
void MainEmuFrame::Menu_Debug_Logging_Click(wxCommandEvent &event) void MainEmuFrame::Menu_Debug_Logging_Click(wxCommandEvent &event)
{ {
//LogOptionsDialog( this, wxID_ANY ).ShowModal(); LogOptionsDialog( this, wxID_ANY ).ShowModal();
} }
void MainEmuFrame::Menu_ShowConsole(wxCommandEvent &event) void MainEmuFrame::Menu_ShowConsole(wxCommandEvent &event)
@ -476,5 +478,5 @@ void MainEmuFrame::Menu_ShowConsole(wxCommandEvent &event)
void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent &event) void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent &event)
{ {
//AboutBoxDialog( this, wxID_ANY ).ShowModal(); AboutBoxDialog( this, wxID_ANY ).ShowModal();
} }

6
pcsx2/windows/VCprojects/pcsx2_2008.vcproj
View File

@ -1978,7 +1978,7 @@
Name="Dialogs" Name="Dialogs"
> >
<File <File
RelativePath="..\..\gui\AboutBoxDialog.cpp" RelativePath="..\..\gui\Dialogs\AboutBoxDialog.cpp"
> >
</File> </File>
<File <File
@ -1998,11 +1998,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\gui\LogOptionsDialog.cpp" RelativePath="..\..\gui\Dialogs\LogOptionsDialog.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\gui\LogOptionsDialog.h" RelativePath="..\..\gui\Dialogs\LogOptionsDialog.h"
> >
</File> </File>
<File <File