diff options
Diffstat (limited to 'src/osk_gui.cpp')
-rw-r--r-- | src/osk_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 155343f04..92b15eaba 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -24,7 +24,7 @@ #include "safeguards.h" -char _keyboard_opt[2][OSK_KEYBOARD_ENTRIES * 4 + 1]; +std::string _keyboard_opt[2]; static WChar _keyboard[2][OSK_KEYBOARD_ENTRIES]; enum KeyStateBits { @@ -356,16 +356,16 @@ void GetKeyboardLayout() char errormark[2][OSK_KEYBOARD_ENTRIES + 1]; // used for marking invalid chars bool has_error = false; // true when an invalid char is detected - if (StrEmpty(_keyboard_opt[0])) { + if (_keyboard_opt[0].empty()) { GetString(keyboard[0], STR_OSK_KEYBOARD_LAYOUT, lastof(keyboard[0])); } else { - strecpy(keyboard[0], _keyboard_opt[0], lastof(keyboard[0])); + strecpy(keyboard[0], _keyboard_opt[0].c_str(), lastof(keyboard[0])); } - if (StrEmpty(_keyboard_opt[1])) { + if (_keyboard_opt[1].empty()) { GetString(keyboard[1], STR_OSK_KEYBOARD_LAYOUT_CAPS, lastof(keyboard[1])); } else { - strecpy(keyboard[1], _keyboard_opt[1], lastof(keyboard[1])); + strecpy(keyboard[1], _keyboard_opt[1].c_str(), lastof(keyboard[1])); } for (uint j = 0; j < 2; j++) { |