Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-20 14:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix compiling on gcc 4.6 (too early to use 4.7.1...)

Browse Source
This commit is contained in:
niczkx
2012-07-30 18:47:21 -06:00
parent 39db801f93
commit 4c369bc823
24 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/ui/uiboxlayout.h
View File

@@ -41,7 +41,7 @@ public:
bool isUIBoxLayout() { return true; }
protected:
bool m_fitChildren = false;
stdext::boolean<false> m_fitChildren;
int m_spacing;
};

6
src/framework/ui/uigridlayout.h
View File

@@ -55,9 +55,9 @@ private:
int m_cellSpacing;
int m_numColumns;
int m_numLines;
bool m_autoSpacing = false;
bool m_fitChildren = false;
bool m_flow = false;
stdext::boolean<false> m_autoSpacing;
stdext::boolean<false> m_fitChildren;
stdext::boolean<false> m_flow;
};
#endif

2
src/framework/ui/uihorizontallayout.h
View File

@@ -39,7 +39,7 @@ public:
protected:
bool internalUpdate();
bool m_alignRight = false;
stdext::boolean<false> m_alignRight;
};
#endif

4
src/framework/ui/uilayout.h
View File

@@ -58,8 +58,8 @@ protected:
virtual bool internalUpdate() = 0;
int m_updateDisabled;
bool m_updating = false;
bool m_updateScheduled = false;
stdext::boolean<false> m_updating;
stdext::boolean<false> m_updateScheduled;
UIWidgetPtr m_parentWidget;
};

4
src/framework/ui/uimanager.h
View File

@@ -82,8 +82,8 @@ private:
UIWidgetPtr m_draggingWidget;
UIWidgetPtr m_hoveredWidget;
UIWidgetPtr m_pressedWidget;
bool m_hoverUpdateScheduled = false;
bool m_drawDebugBoxes = false;
stdext::boolean<false> m_hoverUpdateScheduled;
stdext::boolean<false> m_drawDebugBoxes;
std::unordered_map<std::string, OTMLNodePtr> m_styles;
UIWidgetList m_destroyedWidgets;
ScheduledEventPtr m_checkEvent;