From df12451f837854c816bed32ae0d962fba9601959 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 29 Jun 2016 10:18:56 -0400
Subject: control setting

---
 include/ui_menu.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/ui_menu.hpp')

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;
-- 
cgit v1.2.3