Merge branch 'master' into to_push

1 files changed, 13 insertions, 3 deletions

diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index bcdc90e..9edbe5c 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -30,7 +30,8 @@ namespace FbTk {
 Button::Button(int screen_num, int x, int y,
                unsigned int width, unsigned int height):
     FbWindow(screen_num, x, y, width, height,
-             ExposureMask | ButtonPressMask | ButtonReleaseMask),
+             ExposureMask | ButtonPressMask | EnterWindowMask |
+             LeaveWindowMask | ButtonReleaseMask),
     m_background_pm(0),
     m_pressed_pm(0),
     m_pressed_color(),
@@ -45,7 +46,8 @@ Button::Button(int screen_num, int x, int y,
 Button::Button(const FbWindow &parent, int x, int y, 
                unsigned int width, unsigned int height):
     FbWindow(parent, x, y, width, height,
-             ExposureMask | ButtonPressMask | ButtonReleaseMask),
+             ExposureMask | ButtonPressMask | ButtonReleaseMask |
+             EnterWindowMask | LeaveWindowMask),
     m_background_pm(0),
     m_pressed_pm(0),
     m_pressed_color(),
@@ -90,6 +92,14 @@ void Button::setBackgroundPixmap(Pixmap pm) {
     FbTk::FbWindow::setBackgroundPixmap(pm);
 }
 
+
+void Button::enterNotifyEvent(XCrossingEvent &ce){
+                
+}
+void Button::leaveNotifyEvent(XCrossingEvent &ce){
+                
+}
+
 void Button::buttonPressEvent(XButtonEvent &event) {
     bool update = false;
     if (m_pressed_pm != 0) {
@@ -146,4 +156,4 @@ void Button::exposeEvent(XExposeEvent &event) {
     clearArea(event.x, event.y, event.width, event.height);
 }
 
-}; // end namespace FbTk
+} // end namespace FbTk