diff options
| author | John Peterson <jpeterson57@gmail.com> | 2008-11-16 20:09:13 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2008-11-16 20:09:13 +0000 |
| commit | be6a6215c9942d82e6be0586df285b494aed1c48 (patch) | |
| tree | 1e095511db77028d2894b2c27f2e56cf4e54b500 /Source/Core/DebuggerWX/Src/CodeWindow.cpp | |
| parent | ecf6825a97ddd6f6c88e1362a67c571cee2a3223 (diff) | |
Calibrated emulated Wiimote aiming in widescreen mode. Added config menu to Wiimote. Added hide cursor option to OpenGL plugin. Added custom Wii settings and moved SYSCONF to User/Config (it will be copied by the game to Wii/shared2/sys when a game is run). Made the DSP and Video debugging windowses run on the same dll instance as the main instance.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1188 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/Src/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.cpp | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index 7aa6d43437..45b0d8a5fd 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -64,6 +64,8 @@ // and here are the classes
class CPluginInfo;
class CPluginManager;
+//extern DynamicLibrary Common::CPlugin;
+//extern CPluginManager CPluginManager::m_Instance;
extern "C" {
#include "../resources/toolbar_play.c"
@@ -300,16 +302,21 @@ void CCodeWindow::CreateGUIControls(const SCoreStartupParameter& _LocalCoreStart // possible todo: add some kind of if here to? can it fail?
CPluginManager::GetInstance().OpenDebug(
GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
+ false, true
);
} // don't have any else, just ignore it
if(bVideoWindow)
{
+ wxMessageBox(_T("Warning, automatically opening this window before a game is started \n\
+may cause a crash. Todo: figure out why and fix it."), wxT("OpenGL Debugging Window"));
+
// possible todo: add some kind of if here to? can it fail?
CPluginManager::GetInstance().OpenDebug(
GetHandle(),
- _LocalCoreStartupParameter.m_strVideoPlugin.c_str()
+ _LocalCoreStartupParameter.m_strVideoPlugin.c_str(),
+ true, true
);
} // don't have any else, just ignore it
}
@@ -939,13 +946,19 @@ void CCodeWindow::OnToggleSoundWindow(wxCommandEvent& event) {
// TODO: add some kind of if() check here to?
CPluginManager::GetInstance().OpenDebug(
- GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
- );
+ GetHandle(),
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
+ false, true // DSP, show
+ );
}
else // hide
{
- // can we close the dll window from here?
+ // Close the sound dll that has an open debugger
+ CPluginManager::GetInstance().OpenDebug(
+ GetHandle(),
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
+ false, false // DSP, hide
+ );
}
}
// ===========
@@ -968,12 +981,18 @@ void CCodeWindow::OnToggleVideoWindow(wxCommandEvent& event) // TODO: add some kind of if() check here to?
CPluginManager::GetInstance().OpenDebug(
GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str()
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),
+ true, true // Video, show
);
}
else // hide
{
- // can we close the dll window from here?
+ // Close the video dll that has an open debugger
+ CPluginManager::GetInstance().OpenDebug(
+ GetHandle(),
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),
+ true, false // Video, hide
+ );
}
}
// ===========
|