From a3d036f60ed2333622ee9b61dbddcdc8fbc497c3 Mon Sep 17 00:00:00 2001 From: Marius Nita Date: Sat, 16 Nov 2002 02:15:49 +0000 Subject: added otkapplication and event stuff, changed other files to accomodate for this, changed the test. no idea if anything runs yet. it compiles =) --- otk/widget.hh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'otk/widget.hh') diff --git a/otk/widget.hh b/otk/widget.hh index 60fd2ddb..473aa812 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 #include @@ -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 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; } -- cgit v1.2.3