Fixed: Compilation error when a static property are initialized at same time than this definition

--HG--
branch : atys
hg/atys
Nuno Gonçalves 5 years ago
parent 0c01011cd4
commit a8c4ba0493

@ -167,11 +167,11 @@ namespace NLGUI
return Current.FontSize-2; return Current.FontSize-2;
} }
sint styleStackIndex = 0; static sint styleStackIndex;
inline void pushStyle() inline void pushStyle()
{ {
styleStackIndex++; CCssStyle::styleStackIndex++;
_StyleStack.push_back(Current); _StyleStack.push_back(Current);
Current.DisplayBlock = false; Current.DisplayBlock = false;
@ -186,7 +186,7 @@ namespace NLGUI
inline void popStyle() inline void popStyle()
{ {
styleStackIndex--; CCssStyle::styleStackIndex--;
if (_StyleStack.empty()) if (_StyleStack.empty())
{ {
Current = Root; Current = Root;

@ -31,6 +31,8 @@ using namespace NLMISC;
namespace NLGUI namespace NLGUI
{ {
sint CCssStyle::styleStackIndex = 0;
uint CCssStyle::SStyleRule::specificity() const uint CCssStyle::SStyleRule::specificity() const
{ {
uint count = 0; uint count = 0;

Loading…
Cancel
Save