:

[chaz/openbox] / otk / button.cc

diff --git a/otk/button.cc b/otk/button.cc
index 410f00838bcf37eb7179ad0e8b978a4e15855eaa..3f283b00085ac9869a7e0d3b661995a34ede48ff 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,3 +1,4 @@
+#include <iostream>
 #include "button.hh"
 
 namespace otk {
@@ -66,16 +67,33 @@ void OtkButton::update(void)
   _dirty = false;
 }
 
-bool OtkButton::expose(const XExposeEvent &e)
+int OtkButton::buttonPressHandler(const XButtonEvent &e)
 {
+  press();
   _dirty = true;
-  return OtkFocusWidget::expose(e);
+  update();
+  return OtkFocusWidget::buttonPressHandler(e);
 }
 
-bool OtkButton::configure(const XConfigureEvent &e)
+int OtkButton::buttonReleaseHandler(const XButtonEvent &e)
 {
+  release();
   _dirty = true;
-  return OtkFocusWidget::configure(e);
+  update();
+  return OtkFocusWidget::buttonReleaseHandler(e);
+}
+
+int OtkButton::exposeHandler(const XExposeEvent &e)
+{
+  _dirty = true;
+  return OtkFocusWidget::exposeHandler(e);
+}
+
+int OtkButton::configureHandler(const XConfigureEvent &e)
+{
+  if (!(e.width == width() && e.height == height()))
+    _dirty = true;
+  return OtkFocusWidget::configureHandler(e);
 }
 
 }