diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index 5c0a7e105c..356b30279e 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -36,16 +36,6 @@ enum IDM_VIEW_INT }; -enum class FormatSpecifier -{ - Hex8, - Hex16, - Float, - Double, - UInt, - Int -}; - constexpr const char* special_reg_names[] = {"PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause", "DSISR", "DAR", "PT hashmask"}; @@ -541,27 +531,33 @@ void CRegisterView::OnPopupMenu(wxCommandEvent& event) Refresh(); break; case IDM_VIEW_HEX8: - m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, FormatSpecifier::Hex8); + m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, + CRegTable::FormatSpecifier::Hex8); Refresh(); break; case IDM_VIEW_HEX16: - m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, FormatSpecifier::Hex16); + m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, + CRegTable::FormatSpecifier::Hex16); Refresh(); break; case IDM_VIEW_INT: - m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, FormatSpecifier::Int); + m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, + CRegTable::FormatSpecifier::Int); Refresh(); break; case IDM_VIEW_UINT: - m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, FormatSpecifier::UInt); + m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, + CRegTable::FormatSpecifier::UInt); Refresh(); break; case IDM_VIEW_FLOAT: - m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, FormatSpecifier::Float); + m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, + CRegTable::FormatSpecifier::Float); Refresh(); break; case IDM_VIEW_DOUBLE: - m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, FormatSpecifier::Double); + m_register_table->SetRegisterFormat(m_selectedColumn, m_selectedRow, + CRegTable::FormatSpecifier::Double); Refresh(); break; } diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h index 886a745b80..48eee91def 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.h +++ b/Source/Core/DolphinWX/Debugger/RegisterView.h @@ -28,11 +28,19 @@ #define NUM_SPECIALS 14 -enum class FormatSpecifier; - class CRegTable : public wxGridTableBase { public: + enum class FormatSpecifier + { + Hex8, + Hex16, + Float, + Double, + UInt, + Int + }; + CRegTable(); int GetNumberCols() override { return 9; } int GetNumberRows() override { return 32 + NUM_SPECIALS; }