widgetstate made public

This commit is contained in:
turanszkij
2016-06-19 12:22:33 +02:00
parent 4ce22a9ca2
commit 1a319fb5ae
2 changed files with 12 additions and 10 deletions
+1 -1
View File
@@ -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()
+11 -9
View File
@@ -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];