Drop .NET-specific workaround: _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX

numberZero · sfan5 · commit d90e3ea88d30 · 2018-11-11T18:08:15.000+01:00
diff --git 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
@@ -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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ void GUIEditBoxWithScrollBar::enableOverrideColor(bool enable)`
`148`	`148`
`149`	`149`	`bool GUIEditBoxWithScrollBar::isOverrideColorEnabled() const`
`150`	`150`	`{`
`151`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`152`	`151`	`return m_override_color_enabled;`
`153`	`152`	`}`
`154`	`153`
`@@ -174,7 +173,6 @@ void GUIEditBoxWithScrollBar::updateAbsolutePosition()`
`174`	`173`	`//! Checks if word wrap is enabled`
`175`	`174`	`bool GUIEditBoxWithScrollBar::isWordWrapEnabled() const`
`176`	`175`	`{`
`177`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`178`	`176`	`return m_word_wrap;`
`179`	`177`	`}`
`180`	`178`
`@@ -189,7 +187,6 @@ void GUIEditBoxWithScrollBar::setMultiLine(bool enable)`
`189`	`187`	`//! Checks if multi line editing is enabled`
`190`	`188`	`bool GUIEditBoxWithScrollBar::isMultiLineEnabled() const`
`191`	`189`	`{`
`192`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`193`	`190`	`return m_multiline;`
`194`	`191`	`}`
`195`	`192`
`@@ -208,7 +205,6 @@ void GUIEditBoxWithScrollBar::setPasswordBox(bool password_box, wchar_t password`
`208`	`205`
`209`	`206`	`bool GUIEditBoxWithScrollBar::isPasswordBox() const`
`210`	`207`	`{`
`211`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`212`	`208`	`return m_passwordbox;`
`213`	`209`	`}`
`214`	`210`
`@@ -866,7 +862,6 @@ void GUIEditBoxWithScrollBar::setAutoScroll(bool enable)`
`866`	`862`	`//! \return true if automatic scrolling is enabled, false if not`
`867`	`863`	`bool GUIEditBoxWithScrollBar::isAutoScrollEnabled() const`
`868`	`864`	`{`
`869`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`870`	`865`	`return m_autoscroll;`
`871`	`866`	`}`
`872`	`867`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,6 @@ void intlGUIEditBox::enableOverrideColor(bool enable)`
`182`	`182`
`183`	`183`	`bool intlGUIEditBox::isOverrideColorEnabled() const`
`184`	`184`	`{`
`185`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`186`	`185`	`return OverrideColorEnabled;`
`187`	`186`	`}`
`188`	`187`
`@@ -208,7 +207,6 @@ void intlGUIEditBox::updateAbsolutePosition()`
`208`	`207`	`//! Checks if word wrap is enabled`
`209`	`208`	`bool intlGUIEditBox::isWordWrapEnabled() const`
`210`	`209`	`{`
`211`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`212`	`210`	`return WordWrap;`
`213`	`211`	`}`
`214`	`212`
`@@ -223,7 +221,6 @@ void intlGUIEditBox::setMultiLine(bool enable)`
`223`	`221`	`//! Checks if multi line editing is enabled`
`224`	`222`	`bool intlGUIEditBox::isMultiLineEnabled() const`
`225`	`223`	`{`
`226`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`227`	`224`	`return MultiLine;`
`228`	`225`	`}`
`229`	`226`
`@@ -243,7 +240,6 @@ void intlGUIEditBox::setPasswordBox(bool passwordBox, wchar_t passwordChar)`
`243`	`240`
`244`	`241`	`bool intlGUIEditBox::isPasswordBox() const`
`245`	`242`	`{`
`246`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`247`	`243`	`return PasswordBox;`
`248`	`244`	`}`
`249`	`245`
`@@ -980,7 +976,6 @@ void intlGUIEditBox::setAutoScroll(bool enable)`
`980`	`976`	`//! \return true if automatic scrolling is enabled, false if not`
`981`	`977`	`bool intlGUIEditBox::isAutoScrollEnabled() const`
`982`	`978`	`{`
`983`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`984`	`979`	`return AutoScroll;`
`985`	`980`	`}`
`986`	`981`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@`
`15`	`15`	`#if USE_FREETYPE`
`16`	`16`	`#include "CGUITTFont.h"`
`17`	`17`	`#endif`
`18`		`-#ifndef _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX`
`19`		`- // newer Irrlicht versions no longer have this`
`20`		`- #define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX`
`21`		`-#endif`
`22`	`18`
`23`	`19`	`#include "util/string.h"`
`24`	`20`
`@@ -236,7 +232,6 @@ video::SColor StaticText::getBackgroundColor() const`
`236`	`232`	`//! Checks if background drawing is enabled`
`237`	`233`	`bool StaticText::isDrawBackgroundEnabled() const`
`238`	`234`	`{`
`239`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`240`	`235`	`return Background;`
`241`	`236`	`}`
`242`	`237`
`@@ -251,7 +246,6 @@ void StaticText::setDrawBorder(bool draw)`
`251`	`246`	`//! Checks if border drawing is enabled`
`252`	`247`	`bool StaticText::isDrawBorderEnabled() const`
`253`	`248`	`{`
`254`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`255`	`249`	`return Border;`
`256`	`250`	`}`
`257`	`251`
`@@ -295,7 +289,6 @@ void StaticText::enableOverrideColor(bool enable)`
`295`	`289`
`296`	`290`	`bool StaticText::isOverrideColorEnabled() const`
`297`	`291`	`{`
`298`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`299`	`292`	`return OverrideColorEnabled;`
`300`	`293`	`}`
`301`	`294`
`@@ -311,7 +304,6 @@ void StaticText::setWordWrap(bool enable)`
`311`	`304`
`312`	`305`	`bool StaticText::isWordWrapEnabled() const`
`313`	`306`	`{`
`314`		`- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;`
`315`	`307`	`return WordWrap;`
`316`	`308`	`}`
`317`	`309`