diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-28 02:39:06 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-28 02:40:03 -0600 |
| commit | 03ec9a2e088b0818bf02a5bc2ffda4a512cba2b7 (patch) | |
| tree | cdc77e0e83145ee925baf0c8f404bdf894052c50 /Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp | |
| parent | 56f09d3b91479deb0f3ae3c7ce623c7a4724e087 (diff) | |
Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.
Diffstat (limited to 'Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp index 4e07ed990d..efb7db59af 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp @@ -228,7 +228,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) // text const char* const name = (*g)->control_group->controls[n]->name; // bit of hax so ZL, ZR show up as L, R - dc.DrawText(StrToWxStr((name[1] && name[1] < 'a') ? name[1] : name[0]), n*12 + 2, 1); + dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), n*12 + 2, 1); } delete[] bitmasks; @@ -300,7 +300,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) // text dc.DrawText(StrToWxStr((*g)->control_group->controls[n+trigger_count]->name), 3, n*12 + 1); - dc.DrawText(StrToWxStr((*g)->control_group->controls[n]->name[0]), 64 + 3, n*12 + 1); + dc.DrawText(StrToWxStr(std::string(1, (*g)->control_group->controls[n]->name[0])), 64 + 3, n*12 + 1); } // threshold box |