Various things, also IEF UI

1 files changed, 10 insertions, 5 deletions

diff --git a/includes/interface/Button.h b/includes/interface/Button.h
index 1b2900e..86688cf 100644
--- a/includes/interface/Button.h
+++ b/includes/interface/Button.h
@@ -17,7 +17,12 @@ namespace ui
     class Button : public Component
     {
     public:
-        Button(int x, int y, int width, int height, const std::string& buttonText);
+		Button(State* parent_state, std::string buttonText);
+
+		Button(Point position, Point size, std::string buttonText);
+
+		Button(std::string buttonText);
+		virtual ~Button();
 
         bool Toggleable;
 
@@ -25,12 +30,12 @@ namespace ui
 
         virtual void OnMouseClick(int x, int y, unsigned int button);
         virtual void OnMouseUnclick(int x, int y, unsigned int button);
-        virtual void OnMouseUp(int x, int y, unsigned int button);
+		//virtual void OnMouseUp(int x, int y, unsigned int button);
 
-        virtual void OnMouseEnter(int x, int y, int dx, int dy);
-        virtual void OnMouseLeave(int x, int y, int dx, int dy);
+		virtual void OnMouseEnter(int x, int y);
+		virtual void OnMouseLeave(int x, int y);
 
-        virtual void Draw(void* userdata);
+		virtual void Draw(const Point& screenPos);
 
         inline bool GetState() { return state; }
         virtual void DoAction(); //action of button what ever it may be