summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2014-05-21 21:54:00 -0700
committershuffle2 <godisgovernment@gmail.com>2014-05-21 21:54:00 -0700
commitc3086577798c81cacb39133a666fafd1f52160ce (patch)
treecd80c68ebef6ab7ea8db0a66bfd13504df82108c /Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
parent7a7aa8c5a3909727ad3bd1b3d5300b0c6ad47e46 (diff)
parent554207a87c2e47f61d584c55ca01be3a0424606f (diff)
Merge pull request #376 from lioncash/wx
Wx cleanup
Diffstat (limited to 'Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp')
-rw-r--r--Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
index e1bc6bd3f2..998758d50b 100644
--- a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
+++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
@@ -116,8 +116,8 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
if (GROUP_TYPE_STICK == g->control_group->type)
{
// outline and fill colors
- wxBrush LightGrayBrush(_T("#dddddd"));
- wxPen LightGrayPen(_T("#bfbfbf"));
+ wxBrush LightGrayBrush("#dddddd");
+ wxPen LightGrayPen("#bfbfbf");
dc.SetBrush(LightGrayBrush);
dc.SetPen(LightGrayPen);
@@ -273,7 +273,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
else
{
unsigned char amt = 255 - g->control_group->controls[n]->control_ref->State() * 128;
- dc.SetBrush(wxBrush(wxColor(amt, amt, amt)));
+ dc.SetBrush(wxBrush(wxColour(amt, amt, amt)));
}
dc.DrawRectangle(n * 12, 0, 14, 12);
@@ -391,7 +391,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
// box outline
// Windows XP color
- dc.SetPen(wxPen(_T("#7f9db9")));
+ dc.SetPen(wxPen("#7f9db9"));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(0, 0, bitmap.GetWidth(), bitmap.GetHeight());