diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-08-30 22:04:30 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-08-30 22:04:30 +0000 |
| commit | 63786d54389fd121bc8b0dfcc9751e37161f90ba (patch) | |
| tree | a9704f61ccc418dafa4e3aba02918a04a0e433c1 /Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | |
| parent | 6b97c0b76439e10dc22a094f5023686722ea0eba (diff) | |
GUI: Simplified away the notebook vector, bugfixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4112 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index ee8e535f42..08634f81bf 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -406,11 +406,11 @@ void CCodeWindow::OnToggleSoundWindow(bool Show, int i) if (Show) { - if (Parent->m_NB.size() == 0) return; - if (i < 0 || i > Parent->m_NB.size()-1) i = 0; + if (Parent->GetNotebookCount() == 0) return; + if (i < 0 || i > Parent->GetNotebookCount()-1) i = 0; #ifdef _WIN32 wxWindow *Win = Parent->GetWxWindow(wxT("Sound")); - if (Win && Parent->m_NB[i]->GetPageIndex(Win) != wxNOT_FOUND) return; + if (Win && Parent->GetNotebook(i)->GetPageIndex(Win) != wxNOT_FOUND) return; { #endif @@ -428,7 +428,7 @@ void CCodeWindow::OnToggleSoundWindow(bool Show, int i) if (Win) { //Console->Log(LogTypes::LNOTICE, StringFromFormat("AddPage\n").c_str()); - Parent->m_NB[i]->AddPage(Win, wxT("Sound"), true, Parent->aNormalFile ); + Parent->GetNotebook(i)->AddPage(Win, wxT("Sound"), true, Parent->aNormalFile ); } #endif } @@ -436,7 +436,7 @@ void CCodeWindow::OnToggleSoundWindow(bool Show, int i) { #ifdef _WIN32 wxWindow *Win = Parent->GetWxWindow(wxT("Sound")); - Parent->DoRemovePage (Win, false); + Parent->DoRemovePage(Win, false); #endif // Close the sound dll that has an open debugger CPluginManager::GetInstance().OpenDebug( @@ -454,10 +454,11 @@ void CCodeWindow::OnToggleVideoWindow(bool Show, int i) if (Show) { - if (i < 0 || i > Parent->m_NB.size()-1) return; + if (Parent->GetNotebookCount() == 0) return; + if (i < 0 || i > Parent->GetNotebookCount()-1) i = 0; #ifdef _WIN32 wxWindow *Win = Parent->GetWxWindow(wxT("Video")); - if (Win && Parent->m_NB[i]->GetPageIndex(Win) != wxNOT_FOUND) return; + if (Win && Parent->GetNotebook(i)->GetPageIndex(Win) != wxNOT_FOUND) return; { #endif @@ -471,7 +472,7 @@ void CCodeWindow::OnToggleVideoWindow(bool Show, int i) } Win = Parent->GetWxWindow(wxT("Video")); - if (Win) Parent->m_NB[i]->AddPage(Win, wxT("Video"), true, Parent->aNormalFile ); + if (Win) Parent->GetNotebook(i)->AddPage(Win, wxT("Video"), true, Parent->aNormalFile ); #endif } else // hide |