From 3b5df3c151fcb0efb447b21c4eed5dc388fedaad Mon Sep 17 00:00:00 2001 From: Adi Oanca Date: Wed, 19 Jan 2005 17:55:50 +0000 Subject: [PATCH] 'cursormanager' not global anymore git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10886 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/AppServer.cpp | 10 +++++----- src/servers/app/server/AppServer.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/servers/app/server/AppServer.cpp b/src/servers/app/server/AppServer.cpp index 4b75fa12fa..77eb4c717e 100644 --- a/src/servers/app/server/AppServer.cpp +++ b/src/servers/app/server/AppServer.cpp @@ -47,6 +47,7 @@ #include "Utils.h" #include "FontServer.h" #include "Desktop.h" +#include "RootLayer.h" //#define DEBUG_KEYHANDLING //#define DEBUG_SERVER @@ -131,9 +132,6 @@ AppServer::AppServer(void) InitDecorators(); - // Create the cursor manager. Object declared in CursorManager.cpp - cursormanager= new CursorManager(); - // Set up the Desktop desktop= new Desktop(); desktop->Init(); @@ -180,7 +178,6 @@ AppServer::~AppServer(void) release_sem(fAppListLock); delete bitmapmanager; - delete cursormanager; delete desktop; @@ -681,7 +678,10 @@ void AppServer::DispatchMessage(int32 code, BPortLink &msg) } case AS_SET_SYSCURSOR_DEFAULTS: { - cursormanager->SetDefaults(); + // although this isn't pretty, ATM we only have RootLayer. + // this messages should be handled somewhere into a RootLayer + // specific area - this set is intended for a RootLayer. + desktop->ActiveRootLayer()->GetCursorManager().SetDefaults(); break; } default: diff --git a/src/servers/app/server/AppServer.h b/src/servers/app/server/AppServer.h index 57cdd51837..978946566c 100644 --- a/src/servers/app/server/AppServer.h +++ b/src/servers/app/server/AppServer.h @@ -77,7 +77,6 @@ private: Decorator *new_decorator(BRect rect, const char *title, int32 wlook, int32 wfeel, int32 wflags, DisplayDriver *ddriver); -extern CursorManager *cursormanager; extern BitmapManager *bitmapmanager; extern ColorSet gui_colorset; extern AppServer *app_server;