Commit 0cbb9112 authored by cutealien's avatar cutealien

_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX removed.

This was a bugfix for VS2003 (in combination with .NET) which we haven't supported in a while.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5050 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 2cec5282
-------------------------- --------------------------
Changes in 1.9 (not yet released) Changes in 1.9 (not yet released)
- _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX removed. This was a bugfix for VS2003 (in combination with .NET) which we haven't supported in a while.
- VS 2005 support removed in svn revision 5048. - VS 2005 support removed in svn revision 5048.
- WinCE 6 supported removed in svn revision 5046. - WinCE 6 supported removed in svn revision 5046.
- NVidia CG support removed in svn revision 5045 due to lack of maintenance. NVidia has also stopped supporting this. - NVidia CG support removed in svn revision 5045 due to lack of maintenance. NVidia has also stopped supporting this.
......
...@@ -150,7 +150,6 @@ namespace scene ...@@ -150,7 +150,6 @@ namespace scene
//! Checks if a camera is orthogonal. //! Checks if a camera is orthogonal.
virtual bool isOrthogonal() const virtual bool isOrthogonal() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsOrthogonal; return IsOrthogonal;
} }
......
...@@ -342,7 +342,6 @@ public: ...@@ -342,7 +342,6 @@ public:
//! Returns true if element is visible. //! Returns true if element is visible.
virtual bool isVisible() const virtual bool isVisible() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsVisible; return IsVisible;
} }
...@@ -351,7 +350,6 @@ public: ...@@ -351,7 +350,6 @@ public:
false if this or any parent element is invisible. */ false if this or any parent element is invisible. */
virtual bool isTrulyVisible() const virtual bool isTrulyVisible() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
if(!IsVisible) if(!IsVisible)
return false; return false;
...@@ -371,7 +369,6 @@ public: ...@@ -371,7 +369,6 @@ public:
//! Returns true if this element was created as part of its parent control //! Returns true if this element was created as part of its parent control
virtual bool isSubElement() const virtual bool isSubElement() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsSubElement; return IsSubElement;
} }
...@@ -397,7 +394,6 @@ public: ...@@ -397,7 +394,6 @@ public:
//! Returns true if this element can be focused by navigating with the tab key //! Returns true if this element can be focused by navigating with the tab key
bool isTabStop() const bool isTabStop() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsTabStop; return IsTabStop;
} }
...@@ -451,7 +447,6 @@ public: ...@@ -451,7 +447,6 @@ public:
//! Returns true if this element is a tab group. //! Returns true if this element is a tab group.
bool isTabGroup() const bool isTabGroup() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsTabGroup; return IsTabGroup;
} }
...@@ -478,7 +473,6 @@ public: ...@@ -478,7 +473,6 @@ public:
if ( isSubElement() && IsEnabled && getParent() ) if ( isSubElement() && IsEnabled && getParent() )
return getParent()->isEnabled(); return getParent()->isEnabled();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsEnabled; return IsEnabled;
} }
...@@ -554,7 +548,6 @@ public: ...@@ -554,7 +548,6 @@ public:
} }
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -576,7 +569,6 @@ public: ...@@ -576,7 +569,6 @@ public:
} }
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -628,7 +620,7 @@ public: ...@@ -628,7 +620,7 @@ public:
} while (child->Parent && child != this); } while (child->Parent && child != this);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return child == this; return child == this;
} }
...@@ -711,13 +703,11 @@ public: ...@@ -711,13 +703,11 @@ public:
// search within children // search within children
if ((*it)->getNextElement(startOrder, reverse, group, first, closest)) if ((*it)->getNextElement(startOrder, reverse, group, first, closest))
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return true; return true;
} }
} }
++it; ++it;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
......
...@@ -242,7 +242,6 @@ namespace scene ...@@ -242,7 +242,6 @@ namespace scene
visible (if all parents are also visible). */ visible (if all parents are also visible). */
virtual bool isVisible() const virtual bool isVisible() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsVisible; return IsVisible;
} }
...@@ -251,7 +250,6 @@ namespace scene ...@@ -251,7 +250,6 @@ namespace scene
false if this or any parent node is invisible. */ false if this or any parent node is invisible. */
virtual bool isTrulyVisible() const virtual bool isTrulyVisible() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
if(!IsVisible) if(!IsVisible)
return false; return false;
...@@ -328,7 +326,6 @@ namespace scene ...@@ -328,7 +326,6 @@ namespace scene
return true; return true;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -595,7 +592,6 @@ namespace scene ...@@ -595,7 +592,6 @@ namespace scene
\return If this node is a debug object, true is returned. */ \return If this node is a debug object, true is returned. */
bool isDebugObject() const bool isDebugObject() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsDebugObject; return IsDebugObject;
} }
......
...@@ -54,43 +54,36 @@ class map ...@@ -54,43 +54,36 @@ class map
const ValueTypeRB& getValue() const const ValueTypeRB& getValue() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Value; return Value;
} }
ValueTypeRB& getValue() ValueTypeRB& getValue()
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Value; return Value;
} }
const KeyTypeRB& getKey() const const KeyTypeRB& getKey() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Key; return Key;
} }
bool isRoot() const bool isRoot() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Parent==0; return Parent==0;
} }
bool isLeftChild() const bool isLeftChild() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return (Parent != 0) && (Parent->getLeftChild()==this); return (Parent != 0) && (Parent->getLeftChild()==this);
} }
bool isRightChild() const bool isRightChild() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return (Parent!=0) && (Parent->getRightChild()==this); return (Parent!=0) && (Parent->getRightChild()==this);
} }
bool isLeaf() const bool isLeaf() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return (LeftChild==0) && (RightChild==0); return (LeftChild==0) && (RightChild==0);
} }
...@@ -105,13 +98,11 @@ class map ...@@ -105,13 +98,11 @@ class map
bool isRed() const bool isRed() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsRed; return IsRed;
} }
bool isBlack() const bool isBlack() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return !IsRed; return !IsRed;
} }
...@@ -162,7 +153,6 @@ class map ...@@ -162,7 +153,6 @@ class map
bool atEnd() const bool atEnd() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Cur==0; return Cur==0;
} }
...@@ -311,7 +301,6 @@ class map ...@@ -311,7 +301,6 @@ class map
bool atEnd() const bool atEnd() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Cur==0; return Cur==0;
} }
...@@ -456,7 +445,6 @@ class map ...@@ -456,7 +445,6 @@ class map
bool atEnd() const bool atEnd() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Cur==0; return Cur==0;
} }
...@@ -556,7 +544,6 @@ class map ...@@ -556,7 +544,6 @@ class map
bool atEnd() const bool atEnd() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Cur==0; return Cur==0;
} }
...@@ -654,7 +641,6 @@ class map ...@@ -654,7 +641,6 @@ class map
// Not found // Not found
_IRR_DEBUG_BREAK_IF(node==0) // access violation _IRR_DEBUG_BREAK_IF(node==0) // access violation
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return node->getValue(); return node->getValue();
} }
...@@ -693,7 +679,6 @@ class map ...@@ -693,7 +679,6 @@ class map
if (!insert(newNode)) if (!insert(newNode))
{ {
delete newNode; delete newNode;
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -832,7 +817,6 @@ class map ...@@ -832,7 +817,6 @@ class map
{ {
if (p == 0) if (p == 0)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -888,7 +872,6 @@ class map ...@@ -888,7 +872,6 @@ class map
//! \return Returns true if empty, false if not //! \return Returns true if empty, false if not
bool empty() const bool empty() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Root == 0; return Root == 0;
} }
...@@ -1073,7 +1056,6 @@ class map ...@@ -1073,7 +1056,6 @@ class map
++Size; ++Size;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return result; return result;
} }
......
...@@ -209,19 +209,6 @@ virtual void somefunc() _IRR_OVERRIDE_; ...@@ -209,19 +209,6 @@ virtual void somefunc() _IRR_OVERRIDE_;
#define _IRR_OVERRIDE_ #define _IRR_OVERRIDE_
#endif #endif
//! Defines a small statement to work around a microsoft compiler bug.
/** The microsoft compiler 7.0 - 7.1 has a bug:
When you call unmanaged code that returns a bool type value of false from managed code,
the return value may appear as true. See
http://support.microsoft.com/default.aspx?kbid=823071 for details.
Compiler version defines: VC6.0 : 1200, VC7.0 : 1300, VC7.1 : 1310, VC8.0 : 1400*/
#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER > 1299) && (_MSC_VER < 1400)
#define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX __asm mov eax,100
#else
#define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX
#endif // _IRR_MANAGED_MARSHALLING_BUGFIX
// memory debugging // memory debugging
#if defined(_DEBUG) && defined(IRRLICHT_EXPORTS) && defined(_MSC_VER) && \ #if defined(_DEBUG) && defined(IRRLICHT_EXPORTS) && defined(_MSC_VER) && \
(_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE) (_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE)
......
...@@ -645,7 +645,6 @@ bool CAttributes::getAttributeAsBool(s32 index) ...@@ -645,7 +645,6 @@ bool CAttributes::getAttributeAsBool(s32 index)
if ((u32)index < Attributes.size()) if ((u32)index < Attributes.size())
ret = Attributes[index]->getBool(); ret = Attributes[index]->getBool();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
......
...@@ -50,7 +50,6 @@ void CCameraSceneNode::setInputReceiverEnabled(bool enabled) ...@@ -50,7 +50,6 @@ void CCameraSceneNode::setInputReceiverEnabled(bool enabled)
//! Returns if the input receiver of the camera is currently enabled. //! Returns if the input receiver of the camera is currently enabled.
bool CCameraSceneNode::isInputReceiverEnabled() const bool CCameraSceneNode::isInputReceiverEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return InputReceiverEnabled; return InputReceiverEnabled;
} }
......
...@@ -107,7 +107,6 @@ bool CFileList::isDirectory(u32 index) const ...@@ -107,7 +107,6 @@ bool CFileList::isDirectory(u32 index) const
if (index < Files.size()) if (index < Files.size())
ret = Files[index].IsDirectory; ret = Files[index].IsDirectory;
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
......
...@@ -315,7 +315,6 @@ bool CFileSystem::addFileArchive(const io::path& filename, bool ignoreCase, ...@@ -315,7 +315,6 @@ bool CFileSystem::addFileArchive(const io::path& filename, bool ignoreCase,
os::Printer::log("Could not create archive for", filename, ELL_ERROR); os::Printer::log("Could not create archive for", filename, ELL_ERROR);
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -433,7 +432,6 @@ bool CFileSystem::addFileArchive(IFileArchive* archive) ...@@ -433,7 +432,6 @@ bool CFileSystem::addFileArchive(IFileArchive* archive)
{ {
if (archive == FileArchives[i]) if (archive == FileArchives[i])
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
} }
...@@ -452,7 +450,6 @@ bool CFileSystem::removeFileArchive(u32 index) ...@@ -452,7 +450,6 @@ bool CFileSystem::removeFileArchive(u32 index)
FileArchives.erase(index); FileArchives.erase(index);
ret = true; ret = true;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -466,7 +463,6 @@ bool CFileSystem::removeFileArchive(const io::path& filename) ...@@ -466,7 +463,6 @@ bool CFileSystem::removeFileArchive(const io::path& filename)
if (absPath == FileArchives[i]->getFileList()->getPath()) if (absPath == FileArchives[i]->getFileList()->getPath())
return removeFileArchive(i); return removeFileArchive(i);
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -478,11 +474,9 @@ bool CFileSystem::removeFileArchive(const IFileArchive* archive) ...@@ -478,11 +474,9 @@ bool CFileSystem::removeFileArchive(const IFileArchive* archive)
{ {
if (archive == FileArchives[i]) if (archive == FileArchives[i])
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return removeFileArchive(i); return removeFileArchive(i);
} }
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -953,7 +947,6 @@ bool CFileSystem::existFile(const io::path& filename) const ...@@ -953,7 +947,6 @@ bool CFileSystem::existFile(const io::path& filename) const
if (FileArchives[i]->getFileList()->findFile(filename)!=-1) if (FileArchives[i]->getFileList()->findFile(filename)!=-1)
return true; return true;
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if defined(_IRR_WCHAR_FILESYSTEM) #if defined(_IRR_WCHAR_FILESYSTEM)
return (_waccess(filename.c_str(), 0) != -1); return (_waccess(filename.c_str(), 0) != -1);
......
...@@ -57,7 +57,6 @@ void CGUIButton::setScaleImage(bool scaleImage) ...@@ -57,7 +57,6 @@ void CGUIButton::setScaleImage(bool scaleImage)
//! Returns whether the button scale the used images //! Returns whether the button scale the used images
bool CGUIButton::isScalingImage() const bool CGUIButton::isScalingImage() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ScaleImage; return ScaleImage;
} }
...@@ -476,7 +475,6 @@ void CGUIButton::setIsPushButton(bool isPushButton) ...@@ -476,7 +475,6 @@ void CGUIButton::setIsPushButton(bool isPushButton)
//! Returns if the button is currently pressed //! Returns if the button is currently pressed
bool CGUIButton::isPressed() const bool CGUIButton::isPressed() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Pressed; return Pressed;
} }
...@@ -495,7 +493,6 @@ void CGUIButton::setPressed(bool pressed) ...@@ -495,7 +493,6 @@ void CGUIButton::setPressed(bool pressed)
//! Returns whether the button is a push button //! Returns whether the button is a push button
bool CGUIButton::isPushButton() const bool CGUIButton::isPushButton() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsPushButton; return IsPushButton;
} }
...@@ -510,14 +507,12 @@ void CGUIButton::setUseAlphaChannel(bool useAlphaChannel) ...@@ -510,14 +507,12 @@ void CGUIButton::setUseAlphaChannel(bool useAlphaChannel)
//! Returns if the alpha channel should be used for drawing images on the button //! Returns if the alpha channel should be used for drawing images on the button
bool CGUIButton::isAlphaChannelUsed() const bool CGUIButton::isAlphaChannelUsed() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return UseAlphaChannel; return UseAlphaChannel;
} }
bool CGUIButton::isDrawingBorder() const bool CGUIButton::isDrawingBorder() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return DrawBorder; return DrawBorder;
} }
......
...@@ -197,7 +197,6 @@ void CGUICheckBox::setChecked(bool checked) ...@@ -197,7 +197,6 @@ void CGUICheckBox::setChecked(bool checked)
//! returns if box is checked //! returns if box is checked
bool CGUICheckBox::isChecked() const bool CGUICheckBox::isChecked() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Checked; return Checked;
} }
......
...@@ -201,11 +201,9 @@ bool CGUIContextMenu::isItemEnabled(u32 idx) const ...@@ -201,11 +201,9 @@ bool CGUIContextMenu::isItemEnabled(u32 idx) const
{ {
if (idx >= Items.size()) if (idx >= Items.size())
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Items[idx].Enabled; return Items[idx].Enabled;
} }
...@@ -215,11 +213,9 @@ bool CGUIContextMenu::isItemChecked(u32 idx) const ...@@ -215,11 +213,9 @@ bool CGUIContextMenu::isItemChecked(u32 idx) const
{ {
if (idx >= Items.size()) if (idx >= Items.size())
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Items[idx].Checked; return Items[idx].Checked;
} }
......
...@@ -153,7 +153,6 @@ void CGUIEditBox::enableOverrideColor(bool enable) ...@@ -153,7 +153,6 @@ void CGUIEditBox::enableOverrideColor(bool enable)
bool CGUIEditBox::isOverrideColorEnabled() const bool CGUIEditBox::isOverrideColorEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return OverrideColorEnabled; return OverrideColorEnabled;
} }
...@@ -181,7 +180,6 @@ void CGUIEditBox::updateAbsolutePosition() ...@@ -181,7 +180,6 @@ void CGUIEditBox::updateAbsolutePosition()
//! Checks if word wrap is enabled //! Checks if word wrap is enabled
bool CGUIEditBox::isWordWrapEnabled() const bool CGUIEditBox::isWordWrapEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return WordWrap; return WordWrap;
} }
...@@ -197,7 +195,6 @@ void CGUIEditBox::setMultiLine(bool enable) ...@@ -197,7 +195,6 @@ void CGUIEditBox::setMultiLine(bool enable)
//! Checks if multi line editing is enabled //! Checks if multi line editing is enabled
bool CGUIEditBox::isMultiLineEnabled() const bool CGUIEditBox::isMultiLineEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return MultiLine; return MultiLine;
} }
...@@ -217,7 +214,6 @@ void CGUIEditBox::setPasswordBox(bool passwordBox, wchar_t passwordChar) ...@@ -217,7 +214,6 @@ void CGUIEditBox::setPasswordBox(bool passwordBox, wchar_t passwordChar)
bool CGUIEditBox::isPasswordBox() const bool CGUIEditBox::isPasswordBox() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return PasswordBox; return PasswordBox;
} }
...@@ -1014,7 +1010,6 @@ void CGUIEditBox::setAutoScroll(bool enable) ...@@ -1014,7 +1010,6 @@ void CGUIEditBox::setAutoScroll(bool enable)
//! \return true if automatic scrolling is enabled, false if not //! \return true if automatic scrolling is enabled, false if not
bool CGUIEditBox::isAutoScrollEnabled() const bool CGUIEditBox::isAutoScrollEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return AutoScroll; return AutoScroll;
} }
......
...@@ -221,7 +221,6 @@ bool CGUIEnvironment::setFocus(IGUIElement* element) ...@@ -221,7 +221,6 @@ bool CGUIEnvironment::setFocus(IGUIElement* element)
{ {
if (Focus == element) if (Focus == element)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -249,7 +248,6 @@ bool CGUIEnvironment::setFocus(IGUIElement* element) ...@@ -249,7 +248,6 @@ bool CGUIEnvironment::setFocus(IGUIElement* element)
if (element) if (element)
element->drop(); element->drop();
currentFocus->drop(); currentFocus->drop();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
currentFocus->drop(); currentFocus->drop();
...@@ -274,7 +272,6 @@ bool CGUIEnvironment::setFocus(IGUIElement* element) ...@@ -274,7 +272,6 @@ bool CGUIEnvironment::setFocus(IGUIElement* element)
element->drop(); element->drop();
if (currentFocus) if (currentFocus)
currentFocus->drop(); currentFocus->drop();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
} }
...@@ -317,7 +314,6 @@ bool CGUIEnvironment::removeFocus(IGUIElement* element) ...@@ -317,7 +314,6 @@ bool CGUIEnvironment::removeFocus(IGUIElement* element)
e.GUIEvent.EventType = EGET_ELEMENT_FOCUS_LOST; e.GUIEvent.EventType = EGET_ELEMENT_FOCUS_LOST;
if (Focus->OnEvent(e)) if (Focus->OnEvent(e))
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
} }
...@@ -334,7 +330,6 @@ bool CGUIEnvironment::removeFocus(IGUIElement* element) ...@@ -334,7 +330,6 @@ bool CGUIEnvironment::removeFocus(IGUIElement* element)
//! Returns whether the element has focus //! Returns whether the element has focus
bool CGUIEnvironment::hasFocus(const IGUIElement* element, bool checkSubElements) const bool CGUIEnvironment::hasFocus(const IGUIElement* element, bool checkSubElements) const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
if (element == Focus) if (element == Focus)
return true; return true;
...@@ -414,7 +409,6 @@ bool CGUIEnvironment::OnEvent(const SEvent& event) ...@@ -414,7 +409,6 @@ bool CGUIEnvironment::OnEvent(const SEvent& event)
ret = UserReceiver->OnEvent(event); ret = UserReceiver->OnEvent(event);
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -608,7 +602,6 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event) ...@@ -608,7 +602,6 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event)
// focus could have died in last call // focus could have died in last call
if (!Focus && Hovered) if (!Focus && Hovered)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Hovered->OnEvent(event); return Hovered->OnEvent(event);
} }
...@@ -638,7 +631,6 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event) ...@@ -638,7 +631,6 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event)
break; break;
} // end switch } // end switch
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -751,13 +743,11 @@ bool CGUIEnvironment::saveGUI(const io::path& filename, IGUIElement* start) ...@@ -751,13 +743,11 @@ bool CGUIEnvironment::saveGUI(const io::path& filename, IGUIElement* start)
io::IWriteFile* file = FileSystem->createAndWriteFile(filename); io::IWriteFile* file = FileSystem->createAndWriteFile(filename);
if (!file) if (!file)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
bool ret = saveGUI(file, start); bool ret = saveGUI(file, start);
file->drop(); file->drop();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -767,14 +757,12 @@ bool CGUIEnvironment::saveGUI(io::IWriteFile* file, IGUIElement* start) ...@@ -767,14 +757,12 @@ bool CGUIEnvironment::saveGUI(io::IWriteFile* file, IGUIElement* start)
{ {
if (!file) if (!file)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
io::IXMLWriter* writer = FileSystem->createXMLWriter(file); io::IXMLWriter* writer = FileSystem->createXMLWriter(file);
if (!writer) if (!writer)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -794,14 +782,12 @@ bool CGUIEnvironment::loadGUI(const io::path& filename, IGUIElement* parent) ...@@ -794,14 +782,12 @@ bool CGUIEnvironment::loadGUI(const io::path& filename, IGUIElement* parent)
if (!read) if (!read)
{ {
os::Printer::log("Unable to open gui file", filename, ELL_ERROR); os::Printer::log("Unable to open gui file", filename, ELL_ERROR);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
bool ret = loadGUI(read, parent); bool ret = loadGUI(read, parent);
read->drop(); read->drop();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -812,7 +798,6 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent) ...@@ -812,7 +798,6 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent)
if (!file) if (!file)
{ {
os::Printer::log("Unable to open GUI file", ELL_ERROR); os::Printer::log("Unable to open GUI file", ELL_ERROR);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -820,7 +805,6 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent) ...@@ -820,7 +805,6 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent)
if (!reader) if (!reader)
{ {
os::Printer::log("GUI is not a valid XML file", file->getFileName(), ELL_ERROR); os::Printer::log("GUI is not a valid XML file", file->getFileName(), ELL_ERROR);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
......
...@@ -100,7 +100,6 @@ bool CGUIFont::load(io::IXMLReader* xml, const io::path& directory) ...@@ -100,7 +100,6 @@ bool CGUIFont::load(io::IXMLReader* xml, const io::path& directory)
if (!SpriteBank->getTexture(i)) if (!SpriteBank->getTexture(i))
{ {
os::Printer::log("Unable to load all textures in the font, aborting", ELL_ERROR); os::Printer::log("Unable to load all textures in the font, aborting", ELL_ERROR);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
else else
......
...@@ -133,14 +133,12 @@ void CGUIImage::setScaleImage(bool scale) ...@@ -133,14 +133,12 @@ void CGUIImage::setScaleImage(bool scale)
//! Returns true if the image is scaled to fit, false if not //! Returns true if the image is scaled to fit, false if not
bool CGUIImage::isImageScaled() const bool CGUIImage::isImageScaled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ScaleImage; return ScaleImage;
} }
//! Returns true if the image is using the alpha channel, false if not //! Returns true if the image is using the alpha channel, false if not
bool CGUIImage::isAlphaChannelUsed() const bool CGUIImage::isAlphaChannelUsed() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return UseAlphaChannel; return UseAlphaChannel;
} }
......
...@@ -126,7 +126,6 @@ bool CGUIInOutFader::isReady() const ...@@ -126,7 +126,6 @@ bool CGUIInOutFader::isReady() const
{ {
u32 now = os::Timer::getTime(); u32 now = os::Timer::getTime();
bool ret = (now > EndTime); bool ret = (now > EndTime);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
......
...@@ -649,7 +649,6 @@ void CGUIListBox::setAutoScrollEnabled(bool scroll) ...@@ -649,7 +649,6 @@ void CGUIListBox::setAutoScrollEnabled(bool scroll)
bool CGUIListBox::isAutoScrollEnabled() const bool CGUIListBox::isAutoScrollEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return AutoScroll; return AutoScroll;
} }
......
...@@ -211,7 +211,6 @@ video::SColor CGUIStaticText::getBackgroundColor() const ...@@ -211,7 +211,6 @@ video::SColor CGUIStaticText::getBackgroundColor() const
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
bool CGUIStaticText::isDrawBackgroundEnabled() const bool CGUIStaticText::isDrawBackgroundEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Background; return Background;
} }
...@@ -226,7 +225,6 @@ void CGUIStaticText::setDrawBorder(bool draw) ...@@ -226,7 +225,6 @@ void CGUIStaticText::setDrawBorder(bool draw)
//! Checks if border drawing is enabled //! Checks if border drawing is enabled
bool CGUIStaticText::isDrawBorderEnabled() const bool CGUIStaticText::isDrawBorderEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Border; return Border;
} }
...@@ -266,7 +264,6 @@ void CGUIStaticText::enableOverrideColor(bool enable) ...@@ -266,7 +264,6 @@ void CGUIStaticText::enableOverrideColor(bool enable)
bool CGUIStaticText::isOverrideColorEnabled() const bool CGUIStaticText::isOverrideColorEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return OverrideColorEnabled; return OverrideColorEnabled;
} }
...@@ -282,7 +279,6 @@ void CGUIStaticText::setWordWrap(bool enable) ...@@ -282,7 +279,6 @@ void CGUIStaticText::setWordWrap(bool enable)
bool CGUIStaticText::isWordWrapEnabled() const bool CGUIStaticText::isWordWrapEnabled() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return WordWrap; return WordWrap;
} }
......
...@@ -108,7 +108,6 @@ video::SColor CGUITab::getTextColor() const ...@@ -108,7 +108,6 @@ video::SColor CGUITab::getTextColor() const
//! returns true if the tab is drawing its background, false if not //! returns true if the tab is drawing its background, false if not
bool CGUITab::isDrawingBackground() const bool CGUITab::isDrawingBackground() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return DrawBackground; return DrawBackground;
} }
......
...@@ -176,7 +176,7 @@ bool CIrrDeviceStub::checkVersion(const char* version) ...@@ -176,7 +176,7 @@ bool CIrrDeviceStub::checkVersion(const char* version)
w += version; w += version;
w += "). This may cause problems."; w += "). This may cause problems.";
os::Printer::log(w.c_str(), ELL_WARNING); os::Printer::log(w.c_str(), ELL_WARNING);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -232,7 +232,6 @@ bool CIrrDeviceStub::postEventFromUser(const SEvent& event) ...@@ -232,7 +232,6 @@ bool CIrrDeviceStub::postEventFromUser(const SEvent& event)
if (!absorbed && inputReceiver) if (!absorbed && inputReceiver)
absorbed = inputReceiver->postEventFromUser(event); absorbed = inputReceiver->postEventFromUser(event);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return absorbed; return absorbed;
} }
......
...@@ -1260,7 +1260,6 @@ bool CIrrDeviceWin32::run() ...@@ -1260,7 +1260,6 @@ bool CIrrDeviceWin32::run()
if(!Close && JoyControl) if(!Close && JoyControl)
JoyControl->pollJoysticks(); JoyControl->pollJoysticks();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return !Close; return !Close;
} }
...@@ -1396,7 +1395,6 @@ void CIrrDeviceWin32::closeDevice() ...@@ -1396,7 +1395,6 @@ void CIrrDeviceWin32::closeDevice()
//! returns if window is active. if not, nothing needs to be drawn //! returns if window is active. if not, nothing needs to be drawn
bool CIrrDeviceWin32::isWindowActive() const bool CIrrDeviceWin32::isWindowActive() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return (GetActiveWindow() == HWnd); return (GetActiveWindow() == HWnd);
} }
...@@ -1405,7 +1403,6 @@ bool CIrrDeviceWin32::isWindowActive() const ...@@ -1405,7 +1403,6 @@ bool CIrrDeviceWin32::isWindowActive() const
bool CIrrDeviceWin32::isWindowFocused() const bool CIrrDeviceWin32::isWindowFocused() const
{ {
bool ret = (GetFocus() == HWnd); bool ret = (GetFocus() == HWnd);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -1418,7 +1415,6 @@ bool CIrrDeviceWin32::isWindowMinimized() const ...@@ -1418,7 +1415,6 @@ bool CIrrDeviceWin32::isWindowMinimized() const
bool ret=false; bool ret=false;
if (GetWindowPlacement(HWnd,&plc)) if (GetWindowPlacement(HWnd,&plc))
ret=(plc.showCmd & SW_SHOWMINIMIZED)!=0; ret=(plc.showCmd & SW_SHOWMINIMIZED)!=0;
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -1484,7 +1480,6 @@ bool CIrrDeviceWin32::switchToFullScreen(bool reset) ...@@ -1484,7 +1480,6 @@ bool CIrrDeviceWin32::switchToFullScreen(bool reset)
os::Printer::log("An unknown error occured while changing to fullscreen.", ELL_ERROR); os::Printer::log("An unknown error occured while changing to fullscreen.", ELL_ERROR);
break; break;
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
......
...@@ -177,7 +177,6 @@ namespace irr ...@@ -177,7 +177,6 @@ namespace irr
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const _IRR_OVERRIDE_
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsVisible; return IsVisible;
} }
......
...@@ -354,7 +354,6 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray, ...@@ -354,7 +354,6 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
{ {
if (!selector) if (!selector)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
...@@ -413,7 +412,6 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray, ...@@ -413,7 +412,6 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
} }
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return found; return found;
} }
......
...@@ -1183,7 +1183,6 @@ bool CSceneManager::isCulled(const ISceneNode* node) const ...@@ -1183,7 +1183,6 @@ bool CSceneManager::isCulled(const ISceneNode* node) const
const ICameraSceneNode* cam = getActiveCamera(); const ICameraSceneNode* cam = getActiveCamera();
if (!cam) if (!cam)
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
bool result = false; bool result = false;
...@@ -1251,7 +1250,6 @@ bool CSceneManager::isCulled(const ISceneNode* node) const ...@@ -1251,7 +1250,6 @@ bool CSceneManager::isCulled(const ISceneNode* node) const
} }
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return result; return result;
} }
...@@ -2027,7 +2025,6 @@ bool CSceneManager::postEventFromUser(const SEvent& event) ...@@ -2027,7 +2025,6 @@ bool CSceneManager::postEventFromUser(const SEvent& event)
if (cam) if (cam)
ret = cam->OnEvent(event); ret = cam->OnEvent(event);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
...@@ -2166,7 +2163,6 @@ bool CSceneManager::saveScene(const io::path& filename, ISceneUserDataSerializer ...@@ -2166,7 +2163,6 @@ bool CSceneManager::saveScene(const io::path& filename, ISceneUserDataSerializer
else else
os::Printer::log("Unable to open file", filename, ELL_ERROR); os::Printer::log("Unable to open file", filename, ELL_ERROR);
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
......
...@@ -54,7 +54,6 @@ CSceneNodeAnimatorCollisionResponse::~CSceneNodeAnimatorCollisionResponse() ...@@ -54,7 +54,6 @@ CSceneNodeAnimatorCollisionResponse::~CSceneNodeAnimatorCollisionResponse()
//! the gravity. //! the gravity.
bool CSceneNodeAnimatorCollisionResponse::isFalling() const bool CSceneNodeAnimatorCollisionResponse::isFalling() const
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Falling; return Falling;
} }
......
...@@ -88,7 +88,6 @@ namespace irr ...@@ -88,7 +88,6 @@ namespace irr
virtual bool isStopped() const _IRR_OVERRIDE_ virtual bool isStopped() const _IRR_OVERRIDE_
{ {
bool ret = os::Timer::isStopped(); bool ret = os::Timer::isStopped();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return ret; return ret;
} }
......
...@@ -74,7 +74,6 @@ public: ...@@ -74,7 +74,6 @@ public:
return parseCurrentNode(); return parseCurrentNode();
} }
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment