aboutsummaryrefslogtreecommitdiffstats
path: root/include/ui_menu.hpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-06-29 10:18:56 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-06-29 10:18:56 -0400
commitdf12451f837854c816bed32ae0d962fba9601959 (patch)
tree8f10b1ff814c83f2bc92c19e628e7dcef37ae63b /include/ui_menu.hpp
parenta466eb8fd6e5707aaa1bfafa28535b82c67d69d8 (diff)
control setting
Diffstat (limited to 'include/ui_menu.hpp')
-rw-r--r--include/ui_menu.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/ui_menu.hpp b/include/ui_menu.hpp
index 3ed9fa5..8ca9368 100644
--- a/include/ui_menu.hpp
+++ b/include/ui_menu.hpp
@@ -13,13 +13,13 @@ class menuItem {
public:
int member;
Menu *child;
- union {
+ //union {
struct {
vec2 loc;
dim2 dim;
Color color;
- const char *text;
+ std::string text;
menuFunc func;
} button;
struct {
@@ -31,10 +31,10 @@ public:
float maxValue;
float sliderLoc;
- const char *text;
+ std::string text;
float *var;
} slider;
- };
+ //};
menuItem(){}
~menuItem(){
//button.text = NULL;