From ba58962d2450cd1b27449867bf4decc62be4cc4d Mon Sep 17 00:00:00 2001 From: bushing Date: Fri, 26 Dec 2008 03:46:04 +0000 Subject: [PATCH] Change the font in DebuggerWX to something legible kthx git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1667 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DebuggerWX/Src/BreakpointView.cpp | 2 +- Source/Core/DebuggerWX/Src/CodeView.cpp | 3 +-- Source/Core/DebuggerWX/Src/Debugger.h | 1 + Source/Core/DebuggerWX/Src/MemoryView.cpp | 5 ++--- Source/Core/DebuggerWX/Src/RegisterView.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/Core/DebuggerWX/Src/BreakpointView.cpp b/Source/Core/DebuggerWX/Src/BreakpointView.cpp index 075397c498..bc1588fdf0 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointView.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointView.cpp @@ -30,7 +30,7 @@ END_EVENT_TABLE() CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxListCtrl(parent, id, pos, size, style) { - SetFont(wxFont(9, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("Segoe UI"))); + SetFont(DefaultFont); Refresh(); } diff --git a/Source/Core/DebuggerWX/Src/CodeView.cpp b/Source/Core/DebuggerWX/Src/CodeView.cpp index d59b6b69a3..b6254fc9a7 100644 --- a/Source/Core/DebuggerWX/Src/CodeView.cpp +++ b/Source/Core/DebuggerWX/Src/CodeView.cpp @@ -355,8 +355,7 @@ void CCodeView::OnPaint(wxPaintEvent& event) // ------------------------- wxPaintDC dc(this); wxRect rc = GetClientRect(); - wxFont font(7, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_LIGHT); - dc.SetFont(font); + dc.SetFont(DefaultFont); struct branch { int src, dst, srcAddr; diff --git a/Source/Core/DebuggerWX/Src/Debugger.h b/Source/Core/DebuggerWX/Src/Debugger.h index df65d5f460..2b10c6b8d0 100644 --- a/Source/Core/DebuggerWX/Src/Debugger.h +++ b/Source/Core/DebuggerWX/Src/Debugger.h @@ -34,6 +34,7 @@ enum #define USE_XPM_BITMAPS 1 #include +static wxFont DefaultFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, wxT("monospace")); // define this to use XPMs everywhere (by default, BMPs are used under Win) // BMPs use less space, but aren't compiled into the executable on other platforms diff --git a/Source/Core/DebuggerWX/Src/MemoryView.cpp b/Source/Core/DebuggerWX/Src/MemoryView.cpp index bb76e70ac5..954d0f5cec 100644 --- a/Source/Core/DebuggerWX/Src/MemoryView.cpp +++ b/Source/Core/DebuggerWX/Src/MemoryView.cpp @@ -235,10 +235,9 @@ void CMemoryView::OnErase(wxEraseEvent& event) void CMemoryView::OnPaint(wxPaintEvent& event) { wxPaintDC dc(this); - int fontSize = 8; + int fontSize = 9; wxRect rc = GetClientRect(); - wxFont font(fontSize, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_LIGHT); - dc.SetFont(font); + dc.SetFont(DefaultFont); struct branch { int src, dst, srcAddr; diff --git a/Source/Core/DebuggerWX/Src/RegisterView.cpp b/Source/Core/DebuggerWX/Src/RegisterView.cpp index 83bdc8e522..e8293ba981 100644 --- a/Source/Core/DebuggerWX/Src/RegisterView.cpp +++ b/Source/Core/DebuggerWX/Src/RegisterView.cpp @@ -39,7 +39,7 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind) wxGridCellAttr *attr = new wxGridCellAttr(); attr->SetBackgroundColour(wxColour(wxT("#FFFFFF"))); - attr->SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, wxT("monospace"))); + attr->SetFont(DefaultFont); attr->SetAlignment(col & 1 ? wxALIGN_CENTER : wxALIGN_LEFT, wxALIGN_CENTER); if (col % 2 == 0)