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

diff --git a/otk/button.hh b/otk/button.hh
index 48a0f813..fd2e5e44 100644
--- a/otk/button.hh
+++ b/otk/button.hh
@@ -1,53 +1,52 @@
-#include "focuswidget.hh"
-//#include "pixmap.hh"
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+#ifndef __button_hh
+#define __button_hh
+
+#include "focuslabel.hh"
 
 namespace otk {
 
-class OtkButton : public OtkFocusWidget {
+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);
-
-  inline const std::string &getText(void) const { return _text; }
-  void setText(const std::string &text) { _text = text; _dirty = true; }
-
-  //inline const OtkPixmap &getPixmap(void) const { return _pixmap; }
-  //void setPixmap(const OtkPixmap &pixmap);
+  void setTexture(Texture *texture);
+  void setUnfocusTexture(Texture *texture);
 
   inline bool isPressed(void) const { return _pressed; }
-  void press(void);
-  void release(void);
+  void press(unsigned int mouse_button);
+  void release(unsigned int mouse_button);
 
-  virtual void update(void);
-  virtual bool expose(const XExposeEvent &e);
+  void buttonPressHandler(const XButtonEvent &e);
+  void buttonReleaseHandler(const XButtonEvent &e);
 
+  virtual void setStyle(Style *style);
+  
 private:
 
-  std::string _text;
-  //OtkPixmap _pixmap;
   bool _pressed;
-  bool _dirty;
+  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;
 };
 
 }
+
+#endif