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 /graphics/macgui/mactextwindow.h | |
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 'graphics/macgui/mactextwindow.h')
-rw-r--r-- | graphics/macgui/mactextwindow.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h index c236f47e47..9ff7e7fbd1 100644 --- a/graphics/macgui/mactextwindow.h +++ b/graphics/macgui/mactextwindow.h @@ -60,7 +60,8 @@ public: void setTextWindowFont(const MacFont *macFont); const MacFont *getTextWindowFont(); - void appendText(Common::String str, const MacFont *macFont, bool skipAdd = false); + void appendText(Common::U32String str, const MacFont *macFont, bool skipAdd = false); + void appendText(const Common::String &str, const MacFont *macFont, bool skipAdd = false); void clearText(); void setEditable(bool editable) { _editable = editable; } @@ -68,13 +69,14 @@ public: void undrawCursor(); - const Common::String getInput() { return _inputText; } + const Common::U32String getInput() { return _inputText; } void clearInput(); - void appendInput(Common::String str); + void appendInput(Common::U32String str); + void appendInput(const Common::String &str); - Common::String getSelection(bool formatted = false, bool newlines = true); + Common::U32String getSelection(bool formatted = false, bool newlines = true); void clearSelection(); - Common::String cutSelection(); + Common::U32String cutSelection(); const SelectedText *getSelectedText() { return &_selectedText; } private: @@ -113,7 +115,7 @@ private: SelectedText _selectedText; int _maxWidth; - Common::String _inputText; + Common::U32String _inputText; uint _inputTextHeight; bool _inputIsDirty; |