made DeckMenuItem a subclass of SimpleMenuItem

moved code to check on click position into base class from DeckMenuItem
TODO: apply same logic for standard menus

projects/mtg/include/DeckMenuItem.h

@@ -5,24 +5,18 @@
 #include <JLBFont.h>
 #include <JGui.h>
 #include "DeckMenu.h"
+#include "SimpleMenuItem.h"
 
 using std::string;
 
-class DeckMenuItem: public JGuiObject
+class DeckMenuItem: public SimpleMenuItem
 {
 private:
-    bool mHasFocus;
     bool mScrollEnabled;
     bool mDisplayInitialized;
-    bool mIsValidSelection;
     
     DeckMenu* parent;
-    int fontId;
-    string mText;
     float mTitleResetWidth;
-    static float mYOffset;
-
-    void checkUserClick();
 
 public:
     string imageFilename;
@@ -30,11 +24,9 @@ public:
     float mScrollerOffset;
     DeckMetaData *meta;
 
-    float mX;
-    float mY;
-
     void Relocate(float x, float y);
     float GetWidth();
+    
     string GetText()
     {
         return mText;

projects/mtg/include/SimpleMenuItem.h

@@ -14,16 +14,25 @@ using std::string;
 class SimpleMenuItem: public JGuiObject
 {
 private:
-    bool mHasFocus;
+
     SimpleMenu* parent;
-    int fontId;
-    string mText;
     float mScale;
     float mTargetScale;
+
+protected:
+    int fontId;
+    string mText;
+    bool mHasFocus;
     static float mYOffset;
+    float mXOffset;
+    
+    bool mIsValidSelection;    
+    void checkUserClick();
+
 
 public:
     string desc;
+    SimpleMenuItem(int id);
     SimpleMenuItem(SimpleMenu* _parent, int id, int fontId, string text, float x, float y, bool hasFocus = false, bool autoTranslate = false);
 
     float mX;