Discard the EventSource abstraction

[libs/gui.git] / source / graphics / window.h

diff --git a/source/graphics/window.h b/source/graphics/window.h
index 38b92177f932ca67c6dbee81cd40cbc015f4321e..942fc8c984074f72572828e5ed5efee6f43675ab 100644 (file)
--- a/source/graphics/window.h
+++ b/source/graphics/window.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <sigc++/signal.h>
-#include "eventsource.h"
 
 namespace Msp {
 namespace Graphics {
@@ -20,12 +19,18 @@ struct WindowOptions
        WindowOptions();
 };
 
-class Window: public EventSource
+class Window
 {
 public:
        struct Private;
        struct Event;
 
+       /** Provides input events.  The event structure contents are platform-
+       specific.  Applications will want to use the enclosed Keyboard and Mouse
+       objects instead. */
+       sigc::signal<void, const Event &> signal_input_event;
+
+       sigc::signal<void, unsigned, unsigned> signal_resize;
        sigc::signal<void> signal_close;
 
 protected: