Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'cursormanager' not global anymore

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10886 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca 2005-01-19 17:55:50 +00:00
parent eb7b20d820
commit 3b5df3c151
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/servers/app/server/AppServer.cpp
View File

@ -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:

1
src/servers/app/server/AppServer.h
View File

@ -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;