mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
nakee's new logmanager. added a console window for windows builds (prints to parent console on non-win32). also fix some random wxw bugs: main window's position is saved when using debugger, disabling windows from the tools menu are saved settings, some other small fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2675 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -31,8 +31,6 @@
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include "ConsoleWindow.h" // Open and close console
|
||||
|
||||
#include "Debugger.h"
|
||||
#include "PBView.h"
|
||||
#include "IniFile.h"
|
||||
@ -61,7 +59,7 @@ void CDebugger::DoScrollBlocks()
|
||||
else if(GetAsyncKeyState(VK_NUMPAD2))
|
||||
A += 0.11;
|
||||
|
||||
Console::Print("GetScrollPos:%i GetScrollRange:%i GetPosition:%i GetLastPosition:%i GetMaxWidth:%i \
|
||||
DEBUG_LOG(CONSOLE, "GetScrollPos:%i GetScrollRange:%i GetPosition:%i GetLastPosition:%i GetMaxWidth:%i \
|
||||
GetLineLength:%i XYToPosition:%i\n \
|
||||
GetScrollPos * GetLineLength + GetScrollRange:%i A:%f\n",
|
||||
m_bl95->GetScrollPos(wxVERTICAL), m_bl95->GetScrollRange(wxVERTICAL),
|
||||
|
@ -31,8 +31,6 @@
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include "ConsoleWindow.h" // Open and close console
|
||||
|
||||
#include "Debugger.h"
|
||||
#include "PBView.h"
|
||||
#include "IniFile.h"
|
||||
@ -165,17 +163,11 @@ void CDebugger::OnClose(wxCloseEvent& /*event*/)
|
||||
file.Save(DEBUGGER_CONFIG_FILE);
|
||||
|
||||
EndModal(0);
|
||||
#ifdef _WIN32
|
||||
Console::Close(); // Take the console window with it
|
||||
#endif
|
||||
}
|
||||
|
||||
void CDebugger::DoHide()
|
||||
{
|
||||
Hide();
|
||||
#ifdef _WIN32
|
||||
Console::Close(); // The console goes with the wx window
|
||||
#endif
|
||||
}
|
||||
|
||||
void CDebugger::DoShow()
|
||||
@ -683,12 +675,13 @@ void CDebugger::ShowHideConsole(wxCommandEvent& event)
|
||||
|
||||
void CDebugger::DoShowHideConsole()
|
||||
{
|
||||
#ifdef _WIN32
|
||||
if(m_options->IsChecked(3))
|
||||
OpenConsole();
|
||||
else
|
||||
CloseConsole();
|
||||
#endif
|
||||
// #ifdef _WIN32
|
||||
// if(m_options->IsChecked(3))
|
||||
// OpenConsole();
|
||||
// else
|
||||
// CloseConsole();
|
||||
// #endif
|
||||
PanicAlert("oh crap");
|
||||
}
|
||||
// ==============
|
||||
|
||||
|
@ -33,7 +33,6 @@
|
||||
#endif
|
||||
|
||||
#include "StringUtil.h" // Common
|
||||
#include "ConsoleWindow.h" // Open, close, clear console window
|
||||
|
||||
#include "../Debugger/Debugger.h" // Local
|
||||
#include "../Debugger/PBView.h"
|
||||
@ -887,8 +886,8 @@ void Logging_(short* _pBuffer, int _iSize, int a, bool Wii, ParamBlockType &PBs,
|
||||
// =======================================================================================
|
||||
// Print
|
||||
// ----------------
|
||||
Console::ClearScreen();
|
||||
Console::Print("%s", sbuff.c_str());
|
||||
// FIXME: Console::ClearScreen();
|
||||
INFO_LOG(CONSOLE, "%s", sbuff.c_str());
|
||||
sbuff.clear(); strcpy(buffer, "");
|
||||
// ================
|
||||
|
||||
|
Reference in New Issue
Block a user