aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/guiEditBoxWithScrollbar.cpp5
-rw-r--r--src/gui/intlGUIEditBox.cpp5
-rw-r--r--src/irrlicht_changes/static_text.cpp8
3 files changed, 0 insertions, 18 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;
}
diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp
index 455dbf437..ed1655e0a 100644
--- a/src/irrlicht_changes/static_text.cpp
+++ b/src/irrlicht_changes/static_text.cpp
@@ -15,10 +15,6 @@
#if USE_FREETYPE
#include "CGUITTFont.h"
#endif
-#ifndef _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX
- // newer Irrlicht versions no longer have this
- #define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX
-#endif
#include "util/string.h"
@@ -236,7 +232,6 @@ video::SColor StaticText::getBackgroundColor() const
//! Checks if background drawing is enabled
bool StaticText::isDrawBackgroundEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Background;
}
@@ -251,7 +246,6 @@ void StaticText::setDrawBorder(bool draw)
//! Checks if border drawing is enabled
bool StaticText::isDrawBorderEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Border;
}
@@ -295,7 +289,6 @@ void StaticText::enableOverrideColor(bool enable)
bool StaticText::isOverrideColorEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return OverrideColorEnabled;
}
@@ -311,7 +304,6 @@ void StaticText::setWordWrap(bool enable)
bool StaticText::isWordWrapEnabled() const
{
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return WordWrap;
}