From 1a319fb5ae5010ead6b70ce5e25e45108398a760 Mon Sep 17 00:00:00 2001 From: turanszkij Date: Sun, 19 Jun 2016 12:22:33 +0200 Subject: [PATCH] widgetstate made public --- WickedEngine/wiVersion.cpp | 2 +- WickedEngine/wiWidget.h | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index d5c08ec42..3e347e0b8 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -7,7 +7,7 @@ namespace wiVersion // minor features, major bug fixes const int minor = 8; // minor bug fixes, alterations, refactors - const int revision = 14; + const int revision = 15; long GetVersion() diff --git a/WickedEngine/wiWidget.h b/WickedEngine/wiWidget.h index 284780fb4..5bf0279bb 100644 --- a/WickedEngine/wiWidget.h +++ b/WickedEngine/wiWidget.h @@ -21,14 +21,7 @@ struct wiEventArgs class wiWidget : public Transform { friend class wiGUI; -private: - float fontScaling; -protected: - wiHashString fastName; - string text; - bool enabled; - bool visible; - +public: enum WIDGETSTATE { // widget is doing nothing @@ -40,7 +33,16 @@ protected: // widget has last been active but no more interactions are occuring DEACTIVATING, WIDGETSTATE_COUNT, - } state; + }; +private: + float fontScaling; +protected: + wiHashString fastName; + string text; + bool enabled; + bool visible; + + WIDGETSTATE state; void Activate(); void Deactivate(); wiColor colors[WIDGETSTATE_COUNT];