BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Drop .NET-specific workaround: _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX

Browse Source
This commit is contained in:
number Zero 2018-11-05 14:56:12 +03:00 committed by sfan5
parent 6c42ebfafa
commit d90e3ea88d
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/guiEditBoxWithScrollbar.cpp
View File

@ -148,7 +148,6 @@ void GUIEditBoxWithScrollBar::enableOverrideColor(bool enable)
bool GUIEditBoxWithScrollBar::isOverrideColorEnabled() const bool GUIEditBoxWithScrollBar::isOverrideColorEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_override_color_enabled; return m_override_color_enabled;
} }
@ -174,7 +173,6 @@ void GUIEditBoxWithScrollBar::updateAbsolutePosition()
//! Checks if word wrap is enabled //! Checks if word wrap is enabled
bool GUIEditBoxWithScrollBar::isWordWrapEnabled() const bool GUIEditBoxWithScrollBar::isWordWrapEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_word_wrap; return m_word_wrap;
} }
@ -189,7 +187,6 @@ void GUIEditBoxWithScrollBar::setMultiLine(bool enable)
//! Checks if multi line editing is enabled //! Checks if multi line editing is enabled
bool GUIEditBoxWithScrollBar::isMultiLineEnabled() const bool GUIEditBoxWithScrollBar::isMultiLineEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_multiline; return m_multiline;
} }
@ -208,7 +205,6 @@ void GUIEditBoxWithScrollBar::setPasswordBox(bool password_box, wchar_t password
bool GUIEditBoxWithScrollBar::isPasswordBox() const bool GUIEditBoxWithScrollBar::isPasswordBox() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_passwordbox; return m_passwordbox;
} }
@ -866,7 +862,6 @@ void GUIEditBoxWithScrollBar::setAutoScroll(bool enable)
//! \return true if automatic scrolling is enabled, false if not //! \return true if automatic scrolling is enabled, false if not
bool GUIEditBoxWithScrollBar::isAutoScrollEnabled() const bool GUIEditBoxWithScrollBar::isAutoScrollEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return m_autoscroll; return m_autoscroll;
} }

5
src/gui/intlGUIEditBox.cpp
View File

@ -182,7 +182,6 @@ void intlGUIEditBox::enableOverrideColor(bool enable)
bool intlGUIEditBox::isOverrideColorEnabled() const bool intlGUIEditBox::isOverrideColorEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return OverrideColorEnabled; return OverrideColorEnabled;
} }
@ -208,7 +207,6 @@ void intlGUIEditBox::updateAbsolutePosition()
//! Checks if word wrap is enabled //! Checks if word wrap is enabled
bool intlGUIEditBox::isWordWrapEnabled() const bool intlGUIEditBox::isWordWrapEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return WordWrap; return WordWrap;
} }
@ -223,7 +221,6 @@ void intlGUIEditBox::setMultiLine(bool enable)
//! Checks if multi line editing is enabled //! Checks if multi line editing is enabled
bool intlGUIEditBox::isMultiLineEnabled() const bool intlGUIEditBox::isMultiLineEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return MultiLine; return MultiLine;
} }
@ -243,7 +240,6 @@ void intlGUIEditBox::setPasswordBox(bool passwordBox, wchar_t passwordChar)
bool intlGUIEditBox::isPasswordBox() const bool intlGUIEditBox::isPasswordBox() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return PasswordBox; return PasswordBox;
} }
@ -980,7 +976,6 @@ void intlGUIEditBox::setAutoScroll(bool enable)
//! \return true if automatic scrolling is enabled, false if not //! \return true if automatic scrolling is enabled, false if not
bool intlGUIEditBox::isAutoScrollEnabled() const bool intlGUIEditBox::isAutoScrollEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return AutoScroll; return AutoScroll;
} }

8
src/irrlicht_changes/static_text.cpp
View File

@ -15,10 +15,6 @@
#if USE_FREETYPE #if USE_FREETYPE
#include "CGUITTFont.h" #include "CGUITTFont.h"
#endif #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" #include "util/string.h"
@ -236,7 +232,6 @@ video::SColor StaticText::getBackgroundColor() const
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
bool StaticText::isDrawBackgroundEnabled() const bool StaticText::isDrawBackgroundEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Background; return Background;
} }
@ -251,7 +246,6 @@ void StaticText::setDrawBorder(bool draw)
//! Checks if border drawing is enabled //! Checks if border drawing is enabled
bool StaticText::isDrawBorderEnabled() const bool StaticText::isDrawBorderEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Border; return Border;
} }
@ -295,7 +289,6 @@ void StaticText::enableOverrideColor(bool enable)
bool StaticText::isOverrideColorEnabled() const bool StaticText::isOverrideColorEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return OverrideColorEnabled; return OverrideColorEnabled;
} }
@ -311,7 +304,6 @@ void StaticText::setWordWrap(bool enable)
bool StaticText::isWordWrapEnabled() const bool StaticText::isWordWrapEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return WordWrap; return WordWrap;
} }