X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.hh;h=09fc0d6b6494aa28bf9c36e8b1379b2f88e3a7ad;hb=0ebf6a17547f75c1fa961acbf3fdd59c0e494d22;hp=e73b1f12583f66574198cc65c2cd9fb2cd84f7de;hpb=a3d036f60ed2333622ee9b61dbddcdc8fbc497c3;p=chaz%2Fopenbox

diff --git a/otk/button.hh b/otk/button.hh
index e73b1f12..09fc0d6b 100644
--- a/otk/button.hh
+++ b/otk/button.hh
@@ -1,57 +1,30 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __button_hh
 #define __button_hh
 
-#include "focuswidget.hh"
-//#include "pixmap.hh"
+#include "label.hh"
 
 namespace otk {
 
-class OtkButton : public OtkFocusWidget {
+class Button : public Label {
 
 public:
+  Button(Widget *parent);
+  virtual ~Button();
 
-  OtkButton(OtkWidget *parent);
-  ~OtkButton();
+  virtual inline bool isPressed() const { return _pressed; }
 
-  inline const BTexture *getPressedFocusTexture(void) const
-  { return _pressed_focus_tx; }
-  void setPressedFocusTexture(BTexture *texture)
-  { _pressed_focus_tx = texture; }
+  virtual void press(unsigned int mouse_button);
+  virtual void release(unsigned int mouse_button);
 
-  inline const BTexture *getPressedUnfocusTexture(void) const
-  { return _pressed_unfocus_tx; }
-  void setPressedUnfocusTexture(BTexture *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);
-
-  inline bool isPressed(void) const { return _pressed; }
-  void press(void);
-  void release(void);
-
-  void update(void);
-  int exposeHandler(const XExposeEvent &e);
-  int configureHandler(const XConfigureEvent &e);
+  virtual void buttonPressHandler(const XButtonEvent &e);
+  virtual void buttonReleaseHandler(const XButtonEvent &e);
 
+  virtual void styleChanged(const RenderStyle &style);
+ 
 private:
-
-  std::string _text;
-  //OtkPixmap _pixmap;
   bool _pressed;
-  bool _dirty;
-
-  BTexture *_pressed_focus_tx;
-  BTexture *_pressed_unfocus_tx;
-
-  BTexture *_unpr_focus_tx;
-  BTexture *_unpr_unfocus_tx;
+  unsigned int _mouse_button;
 };
 
 }