X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Feventdispatcher.h;h=b542d67e74d3fa896811b4a04263e9554e4f8902;hp=fec8ded63049ba28911b2e92ef6257accec162e0;hb=7ca970e5db84020e4735afccf43ede4d52ac0bf0;hpb=d16185720fa344263367dbd50c61bfc8183d99a4

diff --git a/source/io/eventdispatcher.h b/source/io/eventdispatcher.h
index fec8ded..b542d67 100644
--- a/source/io/eventdispatcher.h
+++ b/source/io/eventdispatcher.h
@@ -1,8 +1,10 @@
-#ifndef EVENTDISPATCHER_H_
-#define EVENTDISPATCHER_H_
+#ifndef MSP_IO_EVENTDISPATCHER_H_
+#define MSP_IO_EVENTDISPATCHER_H_
 
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
+#include <msp/time/timedelta.h>
+#include <msp/time/timer.h>
 #include "poll.h"
 
 namespace Msp {
@@ -31,6 +33,7 @@ private:
 
 public:
 	EventDispatcher();
+	~EventDispatcher();
 
 	void add(EventObject &);
 	void remove(EventObject &);
@@ -43,6 +46,10 @@ public:
 	waits at most the specified time before returning. */
 	void tick(const Time::TimeDelta &);
 
+	/** Checks for and dispatches events.  If there are no events available,
+	waits until the timer's next timeout before returning. */
+	void tick(const Time::Timer &);
+
 private:
 	void object_events_changed(PollEvent, EventObject *);
 	void object_deleted(EventObject *);