Diff: Menu.h

Revision:

3:688b62ff6474

Parent:

2:fcde41900fa5

Child:

6:49a007861c76

--- a/Menu.h	Sat Apr 04 18:24:21 2015 +0000
+++ b/Menu.h	Sun Apr 26 16:29:53 2015 +0000
@@ -1,4 +1,3 @@
-
 #ifndef _MENU_H_
 #define _MENU_H_
 
@@ -21,28 +20,23 @@
 
 class Menu: public Item {
     public:
-        //Menu will have a limited number of items
         Item ** items;
-        int size;
+        int size, selected, current_line;
         bool isScreen;
-        //selected items variables
-        int selected, current_line;
         
         //menu constructor
-        Menu(char * t, ST7565 *lcd, UI * ui){
+        Menu(char * t, ST7565 *lcd){
             title = t;
             st7565 = lcd;
             items = new Item*[MAX_ITEMS];
-            selected = 0;
-            size = 0;
+            selected = size = 0;
             current_line = FIRST_ITEM_LINE;
             isScreen = false;
             isSelectable = false;
-            this->ui = ui;
         }
         
         //menu item constructor - go to a screen
-        Menu(char * t, Item *screen, UI *ui){
+        Menu(char * t, Item *screen){
             title = t;
             st7565 = NULL;
             items = new Item*[1];
@@ -52,7 +46,6 @@
             current_line = FIRST_ITEM_LINE;
             isScreen = true;
             isSelectable = true;
-            this->ui = ui;
         }
         
         //display the menu