diff options
| author | sfan5 <sfan5@live.de> | 2021-03-19 18:44:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 18:44:32 +0100 |
| commit | 96d4df995c1baf364217699cd43e5ab71918c9d8 (patch) | |
| tree | 531fef95d5886805191e74d0a1bf418e146e1f61 /src/gui/guiConfirmRegistration.cpp | |
| parent | 285ba74723695c4b51192dac0e1e17c5d8f880db (diff) | |
| download | minetest-96d4df995c1baf364217699cd43e5ab71918c9d8.tar.gz minetest-96d4df995c1baf364217699cd43e5ab71918c9d8.tar.bz2 minetest-96d4df995c1baf364217699cd43e5ab71918c9d8.zip | |
Drop old text input workarounds (#11089)
* Drop unused intlGUIEditBox
* Drop unnecessary Linux text input workarounds
Diffstat (limited to 'src/gui/guiConfirmRegistration.cpp')
| -rw-r--r-- | src/gui/guiConfirmRegistration.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp index 4a798c39b..4ca9a64ed 100644 --- a/src/gui/guiConfirmRegistration.cpp +++ b/src/gui/guiConfirmRegistration.cpp @@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <IGUIButton.h> #include <IGUIStaticText.h> #include <IGUIFont.h> -#include "intlGUIEditBox.h" +#include "guiEditBoxWithScrollbar.h" #include "porting.h" #include "gettext.h" @@ -109,10 +109,9 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize) porting::mt_snprintf(info_text_buf, sizeof(info_text_buf), info_text_template.c_str(), m_playername.c_str()); - wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf); - gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true, - Environment, this, ID_intotext, rect2, false, true); - delete[] info_text_buf_wide; + std::wstring info_text_w = utf8_to_wide(info_text_buf); + gui::IGUIEditBox *e = new GUIEditBoxWithScrollBar(info_text_w.c_str(), + true, Environment, this, ID_intotext, rect2, false, true); e->drop(); e->setMultiLine(true); e->setWordWrap(true); |