off-by-one

[chaz/openbox] / otk / button.hh

diff --git a/otk/button.hh b/otk/button.hh
index 2d983fb3c233c8a34a0aea1d0e5be5e8efb8e852..1483677ea348a93ce548a00e9c159514ebe9ec9e 100644 (file)
--- a/otk/button.hh
+++ b/otk/button.hh
@@ -1,3 +1,4 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __button_hh
 #define __button_hh
 
@@ -5,25 +6,25 @@
 
 namespace otk {
 
-class OtkButton : public OtkFocusLabel {
+class Button : public FocusLabel {
 
 public:
 
-  OtkButton(OtkWidget *parent);
-  ~OtkButton();
+  Button(Widget *parent);
+  ~Button();
 
-  inline const BTexture *getPressedFocusTexture(void) const
+  inline const RenderTexture *getPressedFocusTexture(void) const
   { return _pressed_focus_tx; }
-  void setPressedFocusTexture(BTexture *texture)
+  void setPressedFocusTexture(RenderTexture *texture)
   { _pressed_focus_tx = texture; }
 
-  inline const BTexture *getPressedUnfocusTexture(void) const
+  inline const RenderTexture *getPressedUnfocusTexture(void) const
   { return _pressed_unfocus_tx; }
-  void setPressedUnfocusTexture(BTexture *texture)
+  void setPressedUnfocusTexture(RenderTexture *texture)
   { _pressed_unfocus_tx = texture; }
 
-  void setTexture(BTexture *texture);
-  void setUnfocusTexture(BTexture *texture);
+  void setTexture(RenderTexture *texture);
+  void setUnfocusTexture(RenderTexture *texture);
 
   inline bool isPressed(void) const { return _pressed; }
   void press(unsigned int mouse_button);
@@ -32,18 +33,18 @@ public:
   void buttonPressHandler(const XButtonEvent &e);
   void buttonReleaseHandler(const XButtonEvent &e);
 
-  void setStyle(Style *style);
+  virtual void setStyle(RenderStyle *style);
   
 private:
 
   bool _pressed;
   unsigned int _mouse_button;
 
-  BTexture *_pressed_focus_tx;
-  BTexture *_pressed_unfocus_tx;
+  RenderTexture *_pressed_focus_tx;
+  RenderTexture *_pressed_unfocus_tx;
 
-  BTexture *_unpr_focus_tx;
-  BTexture *_unpr_unfocus_tx;
+  RenderTexture *_unpr_focus_tx;
+  RenderTexture *_unpr_unfocus_tx;
 };
 
 }