From fdfb1a55028400c976a7b0aa2df2e8cee0428b7d Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 24 Oct 2018 20:19:51 -0700 Subject: GLK: Move Draw class into new Screen class --- engines/gargoyle/windows.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'engines/gargoyle/windows.h') diff --git a/engines/gargoyle/windows.h b/engines/gargoyle/windows.h index 9092ea46d8..ba9cb9210d 100644 --- a/engines/gargoyle/windows.h +++ b/engines/gargoyle/windows.h @@ -27,7 +27,6 @@ #include "common/list.h" #include "common/rect.h" #include "graphics/screen.h" -#include "gargoyle/draw.h" #include "gargoyle/events.h" #include "gargoyle/glk_types.h" #include "gargoyle/fonts.h" @@ -48,7 +47,7 @@ class PairWindow; /** * Main windows manager */ -class Windows : public Draw { +class Windows { friend class Window; public: class iterator { @@ -238,7 +237,7 @@ struct Attributes { /** * Window definition */ -class Window : public Draw { +class Window { public: Windows *_windows; glui32 _rock; -- cgit v1.2.3