X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=a87877549142f0a87f91c65417f5a6bd48fa0bd9;hb=7df3b620e21777dbefa24f381c1a95fafed1c16e;hp=ca65730c1a5b795800bfde0e34f983f203c48297;hpb=6d68ac2256dc212dc0f2dd8a15d013d6ce3fc4b8;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index ca65730c..a8787754 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,5 +1,5 @@
-#ifndef __focus_hh
-#define __focus_hh
+#ifndef __widget_hh
+#define __widget_hh
 
 #include <string>
 #include <list>
@@ -8,10 +8,12 @@
 #include "point.hh"
 #include "texture.hh"
 #include "style.hh"
+#include "eventhandler.hh"
+#include "application.hh"
 
 namespace otk {
 
-class OtkWidget {
+class OtkWidget : public OtkEventHandler {
 
 public:
 
@@ -20,6 +22,8 @@ public:
   typedef std::list<OtkWidget *> OtkWidgetList;
 
   OtkWidget(OtkWidget *parent, Direction = Horizontal);
+  OtkWidget(OtkApplication *app, Direction direction = Horizontal,
+            Cursor cursor = 0, int bevel_width = 1);
   OtkWidget(Style *style, Direction direction = Horizontal,
             Cursor cursor = 0, int bevel_width = 1);
 
@@ -27,7 +31,8 @@ public:
 
   virtual void update(void);
 
-  virtual bool expose(const XExposeEvent &e);
+  int exposeHandler(const XExposeEvent &e);
+  int configureHandler(const XConfigureEvent &e);
 
   inline Window getWindow(void) const { return _window; }
   inline const OtkWidget *getParent(void) const { return _parent; }
@@ -41,6 +46,9 @@ public:
   virtual void setWidth(int);
   virtual void setHeight(int);
 
+  virtual int width() const { return _rect.width(); }
+  virtual int height() const { return _rect.height(); }
+
   virtual void resize(const Point &to);
   virtual void resize(int x, int y);
 
@@ -88,6 +96,10 @@ public:
   inline Style *getStyle(void) const { return _style; }
   void setStyle(Style *style) { _style = style; }
 
+  inline OtkEventDispatcher *getEventDispatcher(void)
+  { return _event_dispatcher; }
+  void setEventDispatcher(OtkEventDispatcher *disp);
+
 private:
 
   void create(void);
@@ -106,6 +118,7 @@ private:
   Direction _direction;
   Cursor _cursor;
   int _bevel_width;
+  int _ignore_config;
 
   bool _visible;
   bool _focused;
@@ -126,8 +139,9 @@ private:
   bool _fixed_width;
   bool _fixed_height;
 
-protected:
   bool _dirty;
+
+  OtkEventDispatcher *_event_dispatcher;
 };
 
 }