X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=fb3b1e37e5d9404e707e8447d9e242a48ea6bee3;hb=34a9f87ed27b44d5f0337477605fc22306802eac;hp=60fd2ddbea98ffbf75cfb7538ca00bda7a469bf6;hpb=0856b11de843db30b5053c8cb7d9c84eae262852;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index 60fd2ddb..fb3b1e37 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,8 +31,8 @@ public:
 
   virtual void update(void);
 
-  virtual bool expose(const XExposeEvent &e);
-  virtual bool configure(const XConfigureEvent &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; }
@@ -92,6 +96,14 @@ 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);
+
+protected:
+  
+  bool _dirty;
+
 private:
 
   void create(void);
@@ -131,7 +143,7 @@ private:
   bool _fixed_width;
   bool _fixed_height;
 
-  bool _dirty;
+  OtkEventDispatcher *_event_dispatcher;
 };
 
 }