summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authornumber Zero <numzer0@yandex.ru>2018-11-05 14:56:12 +0300
committersfan5 <sfan5@live.de>2018-11-11 18:08:15 +0100
commitd90e3ea88d3073a5dd0094937216aea0b35c1ce4 (patch)
tree13648d22055b4ffaa78d669ac971b911c639f364 /src/gui
parent6c42ebfafa7bc5762fe7ad64b4b9087ba1bc3c38 (diff)
downloadminetest-d90e3ea88d3073a5dd0094937216aea0b35c1ce4.tar.gz
minetest-d90e3ea88d3073a5dd0094937216aea0b35c1ce4.tar.bz2
minetest-d90e3ea88d3073a5dd0094937216aea0b35c1ce4.zip
Drop .NET-specific workaround: _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/guiEditBoxWithScrollbar.cpp5
-rw-r--r--src/gui/intlGUIEditBox.cpp5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp
index f7f933527..4a821c7b4 100644
--- a/src/gui/guiEditBoxWithScrollbar.cpp
+++ b/src/gui/guiEditBoxWithScrollbar.cpp
@@ -148,7 +148,6 @@ void GUIEditBoxWithScrollBar::enableOverrideColor(bool enable)
bool GUIEditBoxWithScrollBar::isOverrideColorEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_override_color_enabled;
}
@@ -174,7 +173,6 @@ void GUIEditBoxWithScrollBar::updateAbsolutePosition()
//! Checks if word wrap is enabled
bool GUIEditBoxWithScrollBar::isWordWrapEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_word_wrap;
}
@@ -189,7 +187,6 @@ void GUIEditBoxWithScrollBar::setMultiLine(bool enable)
//! Checks if multi line editing is enabled
bool GUIEditBoxWithScrollBar::isMultiLineEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_multiline;
}
@@ -208,7 +205,6 @@ void GUIEditBoxWithScrollBar::setPasswordBox(bool password_box, wchar_t password
bool GUIEditBoxWithScrollBar::isPasswordBox() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_passwordbox;
}
@@ -866,7 +862,6 @@ void GUIEditBoxWithScrollBar::setAutoScroll(bool enable)
//! \return true if automatic scrolling is enabled, false if not
bool GUIEditBoxWithScrollBar::isAutoScrollEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_autoscroll;
}
diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
index 374fcc8bb..0c596d3b9 100644
--- a/src/gui/intlGUIEditBox.cpp
+++ b/src/gui/intlGUIEditBox.cpp
@@ -182,7 +182,6 @@ void intlGUIEditBox::enableOverrideColor(bool enable)
bool intlGUIEditBox::isOverrideColorEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return OverrideColorEnabled;
}
@@ -208,7 +207,6 @@ void intlGUIEditBox::updateAbsolutePosition()
//! Checks if word wrap is enabled
bool intlGUIEditBox::isWordWrapEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return WordWrap;
}
@@ -223,7 +221,6 @@ void intlGUIEditBox::setMultiLine(bool enable)
//! Checks if multi line editing is enabled
bool intlGUIEditBox::isMultiLineEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return MultiLine;
}
@@ -243,7 +240,6 @@ void intlGUIEditBox::setPasswordBox(bool passwordBox, wchar_t passwordChar)
bool intlGUIEditBox::isPasswordBox() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return PasswordBox;
}
@@ -980,7 +976,6 @@ void intlGUIEditBox::setAutoScroll(bool enable)
//! \return true if automatic scrolling is enabled, false if not
bool intlGUIEditBox::isAutoScrollEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return AutoScroll;
}