From faecfd46e3e5af312e88aef7c783b10a82742b5d Mon Sep 17 00:00:00 2001 From: hybrid Date: Fri, 14 Sep 2007 07:45:14 +0000 Subject: [PATCH] Two attribute type fixes by CuteAlien. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@951 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/IGUIElement.h | 2 +- source/Irrlicht/CGUIStaticText.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/IGUIElement.h b/include/IGUIElement.h index 0d1b829a..0b662230 100644 --- a/include/IGUIElement.h +++ b/include/IGUIElement.h @@ -819,7 +819,7 @@ public: setEnabled(in->getAttributeAsBool("Enabled")); IsTabStop = in->getAttributeAsBool("TabStop"); IsTabGroup = in->getAttributeAsBool("TabGroup"); - TabOrder = in->getAttributeAsBool("TabOrder"); + TabOrder = in->getAttributeAsInt("TabOrder"); core::position2di p = in->getAttributeAsPosition2d("MaxSize"); setMaxSize(core::dimension2di(p.X,p.Y)); diff --git a/source/Irrlicht/CGUIStaticText.cpp b/source/Irrlicht/CGUIStaticText.cpp index ae321d88..adf3f1fd 100644 --- a/source/Irrlicht/CGUIStaticText.cpp +++ b/source/Irrlicht/CGUIStaticText.cpp @@ -431,8 +431,8 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe IGUIStaticText::deserializeAttributes(in,options); - Border = in->getAttributeAsBool ("Border"); - OverrideColor = in->getAttributeAsBool("OverrideColor"); + Border = in->getAttributeAsBool("Border"); + OverrideColor = in->getAttributeAsColor("OverrideColor"); enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled")); setWordWrap(in->getAttributeAsBool("WordWrap")); @@ -449,3 +449,4 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe } // end namespace irr #endif // _IRR_COMPILE_WITH_GUI_ +