1 files changed, 22 insertions, 12 deletions

diff --git a/include/ui_menu.hpp b/include/ui_menu.hpp
index bfeecba..7c6f2ad 100644
--- a/include/ui_menu.hpp
+++ b/include/ui_menu.hpp
@@ -6,14 +6,15 @@
 
 typedef void (*menuFunc)(void);
 
-struct menuItem {
+class menuItem {
+public:
 	int member;
 	union {
 		struct {
 			vec2 loc;
 			dim2 dim;
 			Color color;
-            
+
 			const char *text;
 			menuFunc func;
 		} button;
@@ -21,28 +22,37 @@ struct menuItem {
 			vec2 loc;
 			dim2 dim;
 			Color color;
-            
+
 			float minValue;
 			float maxValue;
             float sliderLoc;
-            
+
 			const char *text;
 			float *var;
 		} slider;
 	};
+	~menuItem(){
+		//button.text = NULL;
+		//slider.text = NULL;
+
+		//delete[] button.text;
+		//delete[] slider.text;
+		//delete slider.var;
+	}
 };
 
 class Menu {
 public:
 	std::vector<menuItem> items;
-	Menu *child, *parent;
-    
-	~Menu() {
-        // TODO you CANNOT delete null pointers!
-		/*child = NULL;
+	Menu *parent, *child;
+
+	~Menu()
+	{
+		items.clear();
+		//delete child;
+		//delete parent;
+		child = NULL;
 		parent = NULL;
-		delete child;
-		delete parent;*/
 	}
 
 	void gotoChild(void);
@@ -55,7 +65,7 @@ namespace ui {
         menuItem createChildButton(vec2 l, dim2 d, Color c, const char* t);
         menuItem createParentButton(vec2 l, dim2 d, Color c, const char* t);
         menuItem createSlider(vec2 l, dim2 d, Color c, float min, float max, const char* t, float* v);
-        
+
         void draw(void);
     }
 }