reorder how theyre destroyed, probably doesnt matter anyways.

[chaz/openbox] / src / buttonwidget.hh

diff --git a/src/buttonwidget.hh b/src/buttonwidget.hh
index bb23dd90ea399ae75f76c4554b4839d1648c8768..16a21184255099e5a2cfdd591aa4fe28d73d8aae 100644 (file)
--- a/src/buttonwidget.hh
+++ b/src/buttonwidget.hh
@@ -1,25 +1,36 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifndef   __obbuttonwidget_hh
-#define   __obbuttonwidget_hh
+#ifndef   __buttonwidget_hh
+#define   __buttonwidget_hh
 
-#include "otk/button.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
+#include "otk/widget.hh"
 
 namespace ob {
 
-class OBButtonWidget : public otk::OtkButton, public OBWidget
+class ButtonWidget : public otk::Widget, public WidgetBase
 {
 private:
+  void setTextures();
+  bool _pressed;
+  unsigned int _button;
   
 public:
-  OBButtonWidget(otk::OtkWidget *parent, OBWidget::WidgetType type);
-  virtual ~OBButtonWidget();
+  ButtonWidget(otk::Widget *parent, WidgetBase::WidgetType type);
+  virtual ~ButtonWidget();
 
   virtual void setStyle(otk::Style *style);
 
   virtual void adjust();
+
+  virtual void update();
+  
+  virtual void focus();
+  virtual void unfocus();
+
+  virtual void buttonPressHandler(const XButtonEvent &e);
+  virtual void buttonReleaseHandler(const XButtonEvent &e);
 };
 
 }
 
-#endif // __obbuttonwidget_hh
+#endif // __buttonwidget_hh