From 6f7aebd00330c40007b41aa6e48847695924fe29 Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Fri, 20 Jan 2017 13:34:14 -0200
Subject: ControlButton fixed

---
 Project/ControlEditor.h | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'Project/ControlEditor.h')

diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h
index fd35452..95edc07 100644
--- a/Project/ControlEditor.h
+++ b/Project/ControlEditor.h
@@ -3,8 +3,8 @@
 
 #include "ControlEditorBase.h"
 #include <wx/wrapsizer.h>
-#include <wx/bmpbuttn.h>
 #include <wx/dcclient.h>
+#include <wx/dcscreen.h>
 #include <wx/graphics.h>
 
 class ControlElementButton : public wxWindow
@@ -14,10 +14,25 @@ public:
     ~ControlElementButton();
 
 protected:
-    void OnPaint(wxPaintEvent& event);
-    
+    virtual void OnPaint(wxPaintEvent& event);
+    virtual void OnMouseEnter(wxMouseEvent& event);
+    virtual void OnMouseLeave(wxMouseEvent& event);
+    virtual void OnLeftClickDown(wxMouseEvent& event);
+    virtual void OnLeftClickUp(wxMouseEvent& event);
+
     wxString m_label;
+    wxFont m_font;
+    wxPoint m_labelPosition;
+    
     wxImage m_image;
+    wxSize m_imageSize;
+    wxPoint m_imagePosition;
+    
+    int m_borderSize = 2;
+    bool m_mouseAbove = false;
+    bool m_selected = false;
+    
+    wxSize m_buttonSize;
 };
 
 class ControlEditor : public ControlEditorBase
-- 
cgit