working button class (minus fonts)

1 files changed, 24 insertions, 6 deletions

diff --git a/otk/button.hh b/otk/button.hh
index 2fa8e7da..55a2389c 100644
--- a/otk/button.hh
+++ b/otk/button.hh
@@ -1,19 +1,30 @@
-#include "widget.hh"
-#include "style.hh"
-#include "texture.hh"
+#include "focuswidget.hh"
 //#include "pixmap.hh"
 
 namespace otk {
 
-class OtkButton : public OtkWidget {
+class OtkButton : public OtkFocusWidget {
 
 public:
 
   OtkButton(OtkWidget *parent);
   ~OtkButton();
 
+  inline const BTexture *getPressedFocusTexture(void) const
+  { return _pressed_focus_tx; }
+  void setPressedFocusTexture(BTexture *texture)
+  { _pressed_focus_tx = texture; }
+
+  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);
+  void setText(const std::string &text) { _text = text; _dirty = true; }
 
   //inline const OtkPixmap &getPixmap(void) const { return _pixmap; }
   //void setPixmap(const OtkPixmap &pixmap);
@@ -22,13 +33,20 @@ public:
   void press(void);
   void release(void);
 
+  void update(void);
+
 private:
 
   std::string _text;
   //OtkPixmap _pixmap;
   bool _pressed;
-  BTexture *_unfocus_tx;
+  bool _dirty;
+
+  BTexture *_pressed_focus_tx;
+  BTexture *_pressed_unfocus_tx;
 
+  BTexture *_unpr_focus_tx;
+  BTexture *_unpr_unfocus_tx;
 };
 
 }