diff options
| author | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2015-06-10 01:54:33 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-06-13 19:49:55 +0200 |
| commit | b6387b4e0f43503ae139cb31a04f42c401378fdc (patch) | |
| tree | 7b4e56c22d0be7713ac901f41b866ba60b42b7c6 /src/guiFormSpecMenu.h | |
| parent | 572990dcd3f43386860b5b14015ad722fb96ea83 (diff) | |
| download | minetest-b6387b4e0f43503ae139cb31a04f42c401378fdc.tar.gz minetest-b6387b4e0f43503ae139cb31a04f42c401378fdc.tar.bz2 minetest-b6387b4e0f43503ae139cb31a04f42c401378fdc.zip | |
Use utf-8 in formspecs
Diffstat (limited to 'src/guiFormSpecMenu.h')
| -rw-r--r-- | src/guiFormSpecMenu.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index f72595782..f04968aec 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -152,7 +152,7 @@ class GUIFormSpecMenu : public GUIModalMenu FieldSpec() { } - FieldSpec(const std::wstring &name, const std::wstring &label, + FieldSpec(const std::string &name, const std::wstring &label, const std::wstring &fdeflt, int id) : fname(name), flabel(label), @@ -163,7 +163,7 @@ class GUIFormSpecMenu : public GUIModalMenu ftype = f_Unknown; is_exit = false; } - std::wstring fname; + std::string fname; std::wstring flabel; std::wstring fdefault; int fid; @@ -255,7 +255,7 @@ public: void removeChildren(); void setInitialFocus(); - void setFocus(std::wstring elementname) + void setFocus(std::string &elementname) { m_focused_element = elementname; } @@ -278,7 +278,7 @@ public: bool doPause; bool pausesGame() { return doPause; } - GUITable* getTable(std::wstring tablename); + GUITable* getTable(const std::string &tablename); #ifdef __ANDROID__ bool getAndroidUIInput(); @@ -313,7 +313,7 @@ protected: std::vector<FieldSpec> m_fields; std::vector<std::pair<FieldSpec,GUITable*> > m_tables; std::vector<std::pair<FieldSpec,gui::IGUICheckBox*> > m_checkboxes; - std::map<std::wstring, TooltipSpec> m_tooltips; + std::map<std::string, TooltipSpec> m_tooltips; std::vector<std::pair<FieldSpec,gui::IGUIScrollBar*> > m_scrollbars; ItemSpec *m_selected_item; @@ -355,7 +355,7 @@ private: IFormSource *m_form_src; TextDest *m_text_dst; unsigned int m_formspec_version; - std::wstring m_focused_element; + std::string m_focused_element; typedef struct { bool explicit_size; @@ -364,11 +364,11 @@ private: core::rect<s32> rect; v2s32 basepos; v2u32 screensize; - std::wstring focused_fieldname; + std::string focused_fieldname; GUITable::TableOptions table_options; GUITable::TableColumns table_columns; // used to restore table selection/scroll/treeview state - std::map<std::wstring,GUITable::DynamicData> table_dyndata; + std::map<std::string, GUITable::DynamicData> table_dyndata; } parserData; typedef struct { @@ -430,10 +430,10 @@ private: gui::IGUIFont *m_font; std::wstring getLabelByID(s32 id); - std::wstring getNameByID(s32 id); + std::string getNameByID(s32 id); #ifdef __ANDROID__ v2s32 m_down_pos; - std::wstring m_JavaDialogFieldName; + std::string m_JavaDialogFieldName; #endif /* If true, remap a double-click (or double-tap) action to ESC. This is so |