summaryrefslogtreecommitdiff
path: root/Source/Core/DebuggerWX
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2009-09-02 07:59:06 +0000
committernakeee <nakeee@gmail.com>2009-09-02 07:59:06 +0000
commitb2533a5ef28ba01005a7c70d99c8a520004bcd07 (patch)
tree25f5b8dbb12b3b0e64a59fd7c6ff5419d846c8c6 /Source/Core/DebuggerWX
parent7343382f80462ef5ec42d2dd222742d4adade414 (diff)
Fixed various warning fixes and potencial POD/crash bugs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4156 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX')
-rw-r--r--Source/Core/DebuggerWX/Src/CodeWindow.cpp6
-rw-r--r--Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp33
2 files changed, 19 insertions, 20 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index db31ea012d..fd22ae2e0e 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -625,7 +625,7 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
wxMenuItem* pVideo = pDebugDialogs->Append(IDM_VIDEOWINDOW, _T("&Video"), wxEmptyString, wxITEM_CHECK);
pVideo->Check(bVideoWindow);
pDebugDialogs->AppendSeparator();
- wxMenuItem* pFontPicker = pDebugDialogs->Append(IDM_FONTPICKER, _T("&Font..."), wxEmptyString, wxITEM_NORMAL);
+ // wxMenuItem* pFontPicker = pDebugDialogs->Append(IDM_FONTPICKER, _T("&Font..."), wxEmptyString, wxITEM_NORMAL);
pMenuBar->Append(pDebugDialogs, _T("&Views"));
@@ -787,7 +787,7 @@ void CCodeWindow::Update()
void CCodeWindow::UpdateButtonStates()
{
bool Initialized = (Core::GetState() != Core::CORE_UNINITIALIZED);
- bool Running = (Core::GetState() == Core::CORE_RUN);
+ // bool Running = (Core::GetState() == Core::CORE_RUN);
bool Pause = (Core::GetState() == Core::CORE_PAUSE);
wxAuiToolBar* ToolBar = GetToolBar();
@@ -916,4 +916,4 @@ void CCodeWindow::OnStatusBar_(wxUpdateUIEvent& event)
//if(event.GetId() != IDM_ADDRBOX) DoTip(wxEmptyString);
#endif
}
-///////////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
index 21bda68a7f..987c4502cd 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
@@ -203,7 +203,6 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
if (!f)
return;
- bool started = false;
while (!feof(f))
{
char line[512];
@@ -340,18 +339,18 @@ void CCodeWindow::OnToggleWindow(wxCommandEvent& event)
{
Parent->DoToggleWindow(event.GetId(), GetMenuBar()->IsChecked(event.GetId()));
}
-void CCodeWindow::OnToggleCodeWindow(bool Show, int i)
+void CCodeWindow::OnToggleCodeWindow(bool _show, int i)
{
- if (Show)
+ if (_show)
{
Parent->DoAddPage(this, i, "Code");
}
else // hide
Parent->DoRemovePage (this);
}
-void CCodeWindow::OnToggleRegisterWindow(bool Show, int i)
+void CCodeWindow::OnToggleRegisterWindow(bool _show, int i)
{
- if (Show)
+ if (_show)
{
if (!m_RegisterWindow) m_RegisterWindow = new CRegisterWindow(Parent);
Parent->DoAddPage(m_RegisterWindow, i, "Registers");
@@ -360,9 +359,9 @@ void CCodeWindow::OnToggleRegisterWindow(bool Show, int i)
Parent->DoRemovePage (m_RegisterWindow);
}
-void CCodeWindow::OnToggleBreakPointWindow(bool Show, int i)
+void CCodeWindow::OnToggleBreakPointWindow(bool _show, int i)
{
- if (Show)
+ if (_show)
{
if (!m_BreakpointWindow) m_BreakpointWindow = new CBreakPointWindow(this, Parent);
#ifdef _WIN32
@@ -379,9 +378,9 @@ void CCodeWindow::OnToggleBreakPointWindow(bool Show, int i)
#endif
}
-void CCodeWindow::OnToggleJitWindow(bool Show, int i)
+void CCodeWindow::OnToggleJitWindow(bool _show, int i)
{
- if (Show)
+ if (_show)
{
if (!m_JitWindow) m_JitWindow = new CJitWindow(Parent);
#ifdef _WIN32
@@ -399,9 +398,9 @@ void CCodeWindow::OnToggleJitWindow(bool Show, int i)
}
-void CCodeWindow::OnToggleMemoryWindow(bool Show, int i)
+void CCodeWindow::OnToggleMemoryWindow(bool _show, int i)
{
- if (Show)
+ if (_show)
{
if (!m_MemoryWindow) m_MemoryWindow = new CMemoryWindow(Parent);
#ifdef _WIN32
@@ -433,11 +432,11 @@ Notice: This windows docking for plugin windows will produce several wx debuggin
//Toggle Sound Debugging Window
-void CCodeWindow::OnToggleSoundWindow(bool Show, int i)
+void CCodeWindow::OnToggleSoundWindow(bool _show, int i)
{
- ConsoleListener* Console = LogManager::GetInstance()->getConsoleListener();
+ // ConsoleListener* Console = LogManager::GetInstance()->getConsoleListener();
- if (Show)
+ if (_show)
{
if (Parent->GetNotebookCount() == 0) return;
if (i < 0 || i > Parent->GetNotebookCount()-1) i = 0;
@@ -497,11 +496,11 @@ void CCodeWindow::OnToggleSoundWindow(bool Show, int i)
}
// Toggle Video Debugging Window
-void CCodeWindow::OnToggleVideoWindow(bool Show, int i)
+void CCodeWindow::OnToggleVideoWindow(bool _show, int i)
{
//GetMenuBar()->Check(event.GetId(), false); // Turn off
- if (Show)
+ if (_show)
{
if (Parent->GetNotebookCount() == 0) return;
if (i < 0 || i > Parent->GetNotebookCount()-1) i = 0;
@@ -539,4 +538,4 @@ void CCodeWindow::OnToggleVideoWindow(bool Show, int i)
}
}
-///////////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file
+/////////////////////////////////////////////////////////////////////////////////////////////////////////