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

diff --git a/src/buttonwidget.hh b/src/buttonwidget.hh
index c2bb41f4..a888a3d5 100644
--- a/src/buttonwidget.hh
+++ b/src/buttonwidget.hh
@@ -1,13 +1,13 @@
 // -*- 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 ButtonWidget : public otk::Widget, public WidgetBase
 {
 private:
   void setTextures();
@@ -15,14 +15,14 @@ private:
   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 setStyle(otk::RenderStyle *style);
 
   virtual void adjust();
 
-  virtual void update();
+  virtual void renderForeground();
   
   virtual void focus();
   virtual void unfocus();
@@ -33,4 +33,4 @@ public:
 
 }
 
-#endif // __obbuttonwidget_hh
+#endif // __buttonwidget_hh