X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuttonwidget.cc;h=59374c6edd2bc68943c7bc7c7592e2da27be9e3e;hb=cc86c196a2c2793403396bb1d2335b63e1413067;hp=ceca8d38a830735c1be3132fc8b442b768449913;hpb=b8653c3ab8ee785fc0605a960ac83afb97ac7edf;p=chaz%2Fopenbox

diff --git a/src/buttonwidget.cc b/src/buttonwidget.cc
index ceca8d38..59374c6e 100644
--- a/src/buttonwidget.cc
+++ b/src/buttonwidget.cc
@@ -9,22 +9,22 @@
 
 namespace ob {
 
-OBButtonWidget::OBButtonWidget(otk::OtkWidget *parent,
-                               OBWidget::WidgetType type)
-  : otk::OtkWidget(parent),
-    OBWidget(type),
+ButtonWidget::ButtonWidget(otk::Widget *parent,
+                           WidgetBase::WidgetType type)
+  : otk::Widget(parent),
+    WidgetBase(type),
     _pressed(false),
     _button(0)
 {
 }
 
 
-OBButtonWidget::~OBButtonWidget()
+ButtonWidget::~ButtonWidget()
 {
 }
 
 
-void OBButtonWidget::setTextures()
+void ButtonWidget::setTextures()
 {
   switch (type()) {
   case Type_LeftGrip:
@@ -56,9 +56,9 @@ void OBButtonWidget::setTextures()
 }
 
 
-void OBButtonWidget::setStyle(otk::Style *style)
+void ButtonWidget::setStyle(otk::Style *style)
 {
-  otk::OtkWidget::setStyle(style);
+  otk::Widget::setStyle(style);
   setTextures();
 
   switch (type()) {
@@ -77,13 +77,13 @@ void OBButtonWidget::setStyle(otk::Style *style)
 }
 
 
-void OBButtonWidget::update()
+void ButtonWidget::update()
 {
   otk::PixmapMask *pm;
   int width;
   bool draw = _dirty;
 
-  otk::OtkWidget::update();
+  otk::Widget::update();
 
   if (draw) {
     switch (type()) {
@@ -110,49 +110,49 @@ void OBButtonWidget::update()
 
     width = _rect.width();
   
-    otk::BPen pen(_focused ? *_style->getButtonPicFocus() :
-                  *_style->getButtonPicUnfocus());
+    otk::Pen pen(_focused ? *_style->getButtonPicFocus() :
+                 *_style->getButtonPicUnfocus());
 
     // set the clip region
-    XSetClipMask(otk::OBDisplay::display, pen.gc(), pm->mask);
-    XSetClipOrigin(otk::OBDisplay::display, pen.gc(),
+    XSetClipMask(otk::Display::display, pen.gc(), pm->mask);
+    XSetClipOrigin(otk::Display::display, pen.gc(),
                    (width - pm->w)/2, (width - pm->h)/2);
 
     // fill in the clipped region
-    XFillRectangle(otk::OBDisplay::display, _window, pen.gc(),
+    XFillRectangle(otk::Display::display, _window, pen.gc(),
                    (width - pm->w)/2, (width - pm->h)/2,
                    (width + pm->w)/2, (width + pm->h)/2);
 
     // unset the clip region
-    XSetClipMask(otk::OBDisplay::display, pen.gc(), None);
-    XSetClipOrigin(otk::OBDisplay::display, pen.gc(), 0, 0);
+    XSetClipMask(otk::Display::display, pen.gc(), None);
+    XSetClipOrigin(otk::Display::display, pen.gc(), 0, 0);
   }
 }
 
 
-void OBButtonWidget::adjust()
+void ButtonWidget::adjust()
 {
   // nothing to adjust. no children.
 }
 
 
-void OBButtonWidget::focus()
+void ButtonWidget::focus()
 {
-  otk::OtkWidget::focus();
+  otk::Widget::focus();
   setTextures();
 }
 
 
-void OBButtonWidget::unfocus()
+void ButtonWidget::unfocus()
 {
-  otk::OtkWidget::unfocus();
+  otk::Widget::unfocus();
   setTextures();
 }
 
 
-void OBButtonWidget::buttonPressHandler(const XButtonEvent &e)
+void ButtonWidget::buttonPressHandler(const XButtonEvent &e)
 {
-  OtkWidget::buttonPressHandler(e);
+  otk::Widget::buttonPressHandler(e);
   if (_button) return;
   _button = e.button;
   _pressed = true;
@@ -161,9 +161,9 @@ void OBButtonWidget::buttonPressHandler(const XButtonEvent &e)
 }
 
 
-void OBButtonWidget::buttonReleaseHandler(const XButtonEvent &e)
+void ButtonWidget::buttonReleaseHandler(const XButtonEvent &e)
 {
-  OtkWidget::buttonPressHandler(e);
+  otk::Widget::buttonPressHandler(e);
   if (e.button != _button) return;
   _button = 0;
   _pressed = false;