From 22a891a925d68a096420d3383a2e31b58e3eb244 Mon Sep 17 00:00:00 2001 From: stujones11 Date: Wed, 6 Dec 2017 20:36:29 +0000 Subject: Android build fixes for c++11 --- src/gui/guiEditBoxWithScrollbar.cpp | 7 +++++++ src/gui/guiEditBoxWithScrollbar.h | 7 +++++++ src/gui/touchscreengui.h | 1 + 3 files changed, 15 insertions(+) (limited to 'src/gui') 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 #include #include +#include #include #include -- cgit v1.2.3