diff options
| author | Eugene Sandulenko | 2019-10-18 17:20:02 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-10-18 17:20:27 +0200 |
| commit | 419cb1e7c77f7b8089b19becabff105ea4d5e7d5 (patch) | |
| tree | 12438010dfa7c00cfe07e5aaed937fab9595fb8f /engines | |
| parent | 9ff8e69aa98b41a92ac561bfbb15efb9cf58cdac (diff) | |
| download | scummvm-rg350-419cb1e7c77f7b8089b19becabff105ea4d5e7d5.tar.gz scummvm-rg350-419cb1e7c77f7b8089b19becabff105ea4d5e7d5.tar.bz2 scummvm-rg350-419cb1e7c77f7b8089b19becabff105ea4d5e7d5.zip | |
GRAPHICS: MACGUI: Switched MacText to U32String internally
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wage/gui.cpp | 8 | ||||
| -rw-r--r-- | engines/wage/wage.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 99dcfca8dd..8138ff4b6a 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -361,7 +361,7 @@ void Gui::clearOutput() { } void Gui::actionCopy() { - g_system->setTextInClipboard(_consoleWindow->getSelection()); + g_system->setTextInClipboard(Common::convertUtf32ToUtf8(_consoleWindow->getSelection())); _menu->enableCommand(kMenuEdit, kMenuActionPaste, true); } @@ -387,7 +387,7 @@ void Gui::actionClear() { if (_consoleWindow->getSelectedText()->endY == -1) return; - Common::String input = _consoleWindow->getInput(); + Common::String input = Common::convertFromU32String(_consoleWindow->getInput()); _consoleWindow->cutSelection(); @@ -400,9 +400,9 @@ void Gui::actionCut() { if (_consoleWindow->getSelectedText()->endY == -1) return; - Common::String input = _consoleWindow->getInput(); + Common::String input = Common::convertFromU32String(_consoleWindow->getInput()); - g_system->setTextInClipboard(_consoleWindow->cutSelection()); + g_system->setTextInClipboard(Common::convertFromU32String(_consoleWindow->cutSelection())); _undobuffer = input; diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp index 4961feca6e..9a32b120d4 100644 --- a/engines/wage/wage.cpp +++ b/engines/wage/wage.cpp @@ -170,7 +170,7 @@ void WageEngine::processEvents() { case Common::EVENT_KEYDOWN: switch (event.kbd.keycode) { case Common::KEYCODE_RETURN: { - _inputText = _gui->_consoleWindow->getInput(); + _inputText = Common::convertFromU32String(_gui->_consoleWindow->getInput()); Common::String inp = _inputText + '\n'; _gui->appendText(inp.c_str()); |