start of new render code

[chaz/openbox] / otk / button.cc

diff --git a/otk/button.cc b/otk/button.cc
index 9f3930873e20453bc50969c26ed474a28039de7b..bc994b2fc0a4b5f3c3ea47f4a63bed24e3932fd5 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -8,20 +8,20 @@
 
 namespace otk {
 
-OtkButton::OtkButton(OtkWidget *parent)
-  : OtkFocusLabel(parent), _pressed(false), _pressed_focus_tx(0),
+Button::Button(Widget *parent)
+  : FocusLabel(parent), _pressed(false), _pressed_focus_tx(0),
     _pressed_unfocus_tx(0), _unpr_focus_tx(0), _unpr_unfocus_tx(0)
 {
 }
 
-OtkButton::~OtkButton()
+Button::~Button()
 {
 }
 
 
-void OtkButton::setStyle(Style *style)
+void Button::setStyle(Style *style)
 {
-  OtkFocusLabel::setStyle(style);
+  FocusLabel::setStyle(style);
   
   setTexture(style->getButtonFocus());
   setUnfocusTexture(style->getButtonUnfocus());
@@ -30,51 +30,51 @@ void OtkButton::setStyle(Style *style)
 }
 
 
-void OtkButton::press(unsigned int mouse_button)
+void Button::press(unsigned int mouse_button)
 {
   if (_pressed) return;
 
   if (_pressed_focus_tx)
-    OtkFocusWidget::setTexture(_pressed_focus_tx);
+    FocusWidget::setTexture(_pressed_focus_tx);
   if (_pressed_unfocus_tx)
-    OtkFocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
+    FocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
   _pressed = true;
   _mouse_button = mouse_button;
 }
 
-void OtkButton::release(unsigned int mouse_button)
+void Button::release(unsigned int mouse_button)
 {
   if (_mouse_button != mouse_button) return; // wrong button
 
-  OtkFocusWidget::setTexture(_unpr_focus_tx);
-  OtkFocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
+  FocusWidget::setTexture(_unpr_focus_tx);
+  FocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
   _pressed = false;
 }
 
-void OtkButton::setTexture(BTexture *texture)
+void Button::setTexture(Texture *texture)
 {
-  OtkFocusWidget::setTexture(texture);
+  FocusWidget::setTexture(texture);
   _unpr_focus_tx = texture;
 }
 
-void OtkButton::setUnfocusTexture(BTexture *texture)
+void Button::setUnfocusTexture(Texture *texture)
 {
-  OtkFocusWidget::setUnfocusTexture(texture);
+  FocusWidget::setUnfocusTexture(texture);
   _unpr_unfocus_tx = texture;
 }
 
-void OtkButton::buttonPressHandler(const XButtonEvent &e)
+void Button::buttonPressHandler(const XButtonEvent &e)
 {
   press(e.button);
   update();
-  OtkFocusWidget::buttonPressHandler(e);
+  FocusWidget::buttonPressHandler(e);
 }
 
-void OtkButton::buttonReleaseHandler(const XButtonEvent &e)
+void Button::buttonReleaseHandler(const XButtonEvent &e)
 {
   release(e.button);
   update();
-  OtkFocusWidget::buttonReleaseHandler(e);
+  FocusWidget::buttonReleaseHandler(e);
 }
 
 }