Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2

1 files changed, 9 insertions, 3 deletions

diff --git a/backends/base-backend.h b/backends/base-backend.h
index 6b19b7a9cb..c797e831a8 100644
--- a/backends/base-backend.h
+++ b/backends/base-backend.h
@@ -24,16 +24,22 @@
 #define BACKENDS_BASE_BACKEND_H
 
 #include "common/system.h"
-#include "backends/events/default/default-events.h"
+#include "common/events.h"
 
-class BaseBackend : public OSystem, Common::EventSource {
+class BaseBackend : public OSystem {
+protected:
+	virtual Common::EventSource *getDefaultEventSource() = 0;
 public:
 	virtual void initBackend();
 
 	virtual void displayMessageOnOSD(const char *msg);
 	virtual void fillScreen(uint32 col);
+};
 
-	virtual void resetGraphicsScale();
+class EventsBaseBackend : public BaseBackend, Common::EventSource {
+protected:
+	virtual Common::EventSource *getDefaultEventSource() { return this; }
+public:
 };