diff options
| author | stujones11 <stujones111@gmail.com> | 2017-12-06 20:36:29 +0000 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-11 16:56:27 +0100 |
| commit | 22a891a925d68a096420d3383a2e31b58e3eb244 (patch) | |
| tree | 21de815d25b2f9727aa019f063566426d265fa74 /src/gui | |
| parent | 69247ca2233d1b2e77485b8d32aca41c7e525e74 (diff) | |
| download | minetest-22a891a925d68a096420d3383a2e31b58e3eb244.tar.gz minetest-22a891a925d68a096420d3383a2e31b58e3eb244.tar.bz2 minetest-22a891a925d68a096420d3383a2e31b58e3eb244.zip | |
Android build fixes for c++11
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/guiEditBoxWithScrollbar.cpp | 7 | ||||
| -rw-r--r-- | src/gui/guiEditBoxWithScrollbar.h | 7 | ||||
| -rw-r--r-- | src/gui/touchscreengui.h | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp index d4d2a0c1c..cf278a58e 100644 --- a/src/gui/guiEditBoxWithScrollbar.cpp +++ b/src/gui/guiEditBoxWithScrollbar.cpp @@ -1522,3 +1522,10 @@ void GUIEditBoxWithScrollBar::deserializeAttributes(io::IAttributes* in, io::SAt // setOverrideFont(in->getAttributeAsFont("OverrideFont")); setWritable(in->getAttributeAsBool("Writable")); } + +bool GUIEditBoxWithScrollBar::isDrawBackgroundEnabled() const { return false; } +bool GUIEditBoxWithScrollBar::isDrawBorderEnabled() const { return false; } +void GUIEditBoxWithScrollBar::setCursorChar(const wchar_t cursorChar) { } +wchar_t GUIEditBoxWithScrollBar::getCursorChar() const { return '|'; } +void GUIEditBoxWithScrollBar::setCursorBlinkTime(irr::u32 timeMs) { } +irr::u32 GUIEditBoxWithScrollBar::getCursorBlinkTime() const { return 500; } diff --git a/src/gui/guiEditBoxWithScrollbar.h b/src/gui/guiEditBoxWithScrollbar.h index cca2f6536..cedffd82f 100644 --- a/src/gui/guiEditBoxWithScrollbar.h +++ b/src/gui/guiEditBoxWithScrollbar.h @@ -128,6 +128,13 @@ public: //! Reads attributes of the element virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options); + virtual bool isDrawBackgroundEnabled() const; + virtual bool isDrawBorderEnabled() const; + virtual void setCursorChar(const wchar_t cursorChar); + virtual wchar_t getCursorChar() const; + virtual void setCursorBlinkTime(irr::u32 timeMs); + virtual irr::u32 getCursorBlinkTime() const; + protected: //! Breaks the single text line. void breakText(); diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h index da97381cd..9d4150ea6 100644 --- a/src/gui/touchscreengui.h +++ b/src/gui/touchscreengui.h @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <IEventReceiver.h> #include <IGUIButton.h> #include <IGUIEnvironment.h> +#include <IrrlichtDevice.h> #include <map> #include <vector> |