X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuttonwidget.hh;h=0d546f73fc8fc67763fc690e9bf6b0b68a43dcb9;hb=ff98438acca3ae7ca0b2be66cb39cc29643ecaba;hp=c2bb41f4ddba8ea6b1ccff177d40b7dc293e296f;hpb=5fdd493d0d2255f134114e69f028371366f4dfd3;p=chaz%2Fopenbox

diff --git a/src/buttonwidget.hh b/src/buttonwidget.hh
index c2bb41f4..0d546f73 100644
--- a/src/buttonwidget.hh
+++ b/src/buttonwidget.hh
@@ -1,29 +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 "widgetbase.hh"
 #include "otk/widget.hh"
-#include "widget.hh"
 
 namespace ob {
 
-class OBButtonWidget : public otk::OtkWidget, public OBWidget
+class Client;
+
+class ButtonWidget : public otk::Widget, public WidgetBase
 {
 private:
   void setTextures();
+  Client *_client;
   bool _pressed;
   unsigned int _button;
+  bool _state;
   
 public:
-  OBButtonWidget(otk::OtkWidget *parent, OBWidget::WidgetType type);
-  virtual ~OBButtonWidget();
+  ButtonWidget(otk::Widget *parent, WidgetBase::WidgetType type,
+               Client *client);
+  virtual ~ButtonWidget();
 
-  virtual void setStyle(otk::Style *style);
+  virtual void setStyle(otk::RenderStyle *style);
 
   virtual void adjust();
 
   virtual void update();
   
+  virtual void renderForeground();
+  
   virtual void focus();
   virtual void unfocus();
 
@@ -33,4 +40,4 @@ public:
 
 }
 
-#endif // __obbuttonwidget_hh
+#endif // __buttonwidget_hh