From 1863b5b6a41fb94ca20b2cd8fba33063bfa6a6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 24 Nov 2005 17:59:49 +0000 Subject: [PATCH] Removed the "owner" stuff from Layer - it already knows its window. Layer no longer knows anything about its subclass WindowLayer. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15131 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Layer.cpp | 8 ++++---- src/servers/app/Layer.h | 3 --- src/servers/app/ServerWindow.cpp | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/servers/app/Layer.cpp b/src/servers/app/Layer.cpp index 138e3433e3..3c3d853cce 100644 --- a/src/servers/app/Layer.cpp +++ b/src/servers/app/Layer.cpp @@ -8,9 +8,10 @@ * Stephan Aßmus */ -/** Class used for tracking drawing context and screen clipping. - * One Layer per client BWindow (WindowBorder) and each BView therein. - */ +/*! + Class used for tracking drawing context and screen clipping. + One Layer per client BWindow (WindowLayer) and each BView therein. +*/ #include #include @@ -50,7 +51,6 @@ Layer::Layer(BRect frame, const char* name, int32 token, fDriver(driver), fRootLayer(NULL), fWindow(NULL), - fOwner(NULL), fDrawState(new DrawState), diff --git a/src/servers/app/Layer.h b/src/servers/app/Layer.h index bab4c9445a..706baa74cb 100644 --- a/src/servers/app/Layer.h +++ b/src/servers/app/Layer.h @@ -170,8 +170,6 @@ class Layer { { return fWindow; } ServerApp* App() const { return fWindow ? fWindow->App() : NULL; } - inline WindowLayer* Owner() const - { return fOwner; } RootLayer* GetRootLayer() const { return fRootLayer; } void SetRootLayer(RootLayer* rl) @@ -240,7 +238,6 @@ class Layer { DrawingEngine* fDriver; RootLayer* fRootLayer; ServerWindow* fWindow; - WindowLayer* fOwner; DrawState* fDrawState; diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index 1772c4fef5..b107ce8eae 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -506,7 +506,6 @@ ServerWindow::CreateLayerTree(BPrivate::LinkReceiver &link, Layer **_parent) newLayer->fHidden = hidden; newLayer->fEventMask = eventMask; newLayer->fEventOptions = eventOptions; - newLayer->fOwner = fWindowLayer; DesktopSettings settings(fDesktop); ServerFont font;