X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.hh;h=fd2e5e4494f8fb91f75d3777d04b84ebe5236821;hb=9e8f89b61976424c7d1c6e6a37498da74b7850ce;hp=c5b9d963e86b42acc7a2b6c94e990770cead9409;hpb=d4d15160fe81353a9f7958c1feb1821abe179a70;p=chaz%2Fopenbox

diff --git a/otk/button.hh b/otk/button.hh
index c5b9d963..fd2e5e44 100644
--- 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,43 +6,45 @@
 
 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 Texture *getPressedFocusTexture(void) const
   { return _pressed_focus_tx; }
-  void setPressedFocusTexture(BTexture *texture)
+  void setPressedFocusTexture(Texture *texture)
   { _pressed_focus_tx = texture; }
 
-  inline const BTexture *getPressedUnfocusTexture(void) const
+  inline const Texture *getPressedUnfocusTexture(void) const
   { return _pressed_unfocus_tx; }
-  void setPressedUnfocusTexture(BTexture *texture)
+  void setPressedUnfocusTexture(Texture *texture)
   { _pressed_unfocus_tx = texture; }
 
-  void setTexture(BTexture *texture);
-  void setUnfocusTexture(BTexture *texture);
+  void setTexture(Texture *texture);
+  void setUnfocusTexture(Texture *texture);
 
   inline bool isPressed(void) const { return _pressed; }
   void press(unsigned int mouse_button);
   void release(unsigned int mouse_button);
 
-  int buttonPressHandler(const XButtonEvent &e);
-  int buttonReleaseHandler(const XButtonEvent &e);
+  void buttonPressHandler(const XButtonEvent &e);
+  void buttonReleaseHandler(const XButtonEvent &e);
 
+  virtual void setStyle(Style *style);
+  
 private:
 
   bool _pressed;
   unsigned int _mouse_button;
 
-  BTexture *_pressed_focus_tx;
-  BTexture *_pressed_unfocus_tx;
+  Texture *_pressed_focus_tx;
+  Texture *_pressed_unfocus_tx;
 
-  BTexture *_unpr_focus_tx;
-  BTexture *_unpr_unfocus_tx;
+  Texture *_unpr_focus_tx;
+  Texture *_unpr_unfocus_tx;
 };
 
 }