Commit faecfd46 authored by hybrid's avatar hybrid

Two attribute type fixes by CuteAlien.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@951 dfc29bdd-3216-0410-991c-e03cc46cb475
parent b8eb707b
...@@ -819,7 +819,7 @@ public: ...@@ -819,7 +819,7 @@ public:
setEnabled(in->getAttributeAsBool("Enabled")); setEnabled(in->getAttributeAsBool("Enabled"));
IsTabStop = in->getAttributeAsBool("TabStop"); IsTabStop = in->getAttributeAsBool("TabStop");
IsTabGroup = in->getAttributeAsBool("TabGroup"); IsTabGroup = in->getAttributeAsBool("TabGroup");
TabOrder = in->getAttributeAsBool("TabOrder"); TabOrder = in->getAttributeAsInt("TabOrder");
core::position2di p = in->getAttributeAsPosition2d("MaxSize"); core::position2di p = in->getAttributeAsPosition2d("MaxSize");
setMaxSize(core::dimension2di(p.X,p.Y)); setMaxSize(core::dimension2di(p.X,p.Y));
......
...@@ -431,8 +431,8 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe ...@@ -431,8 +431,8 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
IGUIStaticText::deserializeAttributes(in,options); IGUIStaticText::deserializeAttributes(in,options);
Border = in->getAttributeAsBool ("Border"); Border = in->getAttributeAsBool("Border");
OverrideColor = in->getAttributeAsBool("OverrideColor"); OverrideColor = in->getAttributeAsColor("OverrideColor");
enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled")); enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
setWordWrap(in->getAttributeAsBool("WordWrap")); setWordWrap(in->getAttributeAsBool("WordWrap"));
...@@ -449,3 +449,4 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe ...@@ -449,3 +449,4 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
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