From 73fc67136c7333e0d875c59527deefb5dc38b5ab Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Tue, 29 Mar 2005 23:00:58 +0000 Subject: [PATCH] Choose headers according to DISPLAYDRIVER, too. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12146 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 54e54451c5..4683c80b26 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -41,12 +41,15 @@ #include "WinBorder.h" #include "Workspace.h" -#include "AccelerantDriver.h" -#ifndef __HAIKU__ - #include "ViewDriver.h" +#if DISPLAYDRIVER == HWDRIVER + #include "AccelerantDriver.h" +#elif DISPLAYDRIVER == DIRECTDRIVER #include "DirectDriver.h" +#elif DISPLAYDRIVER == PAINTERDRIVER #include "DisplayDriverPainter.h" -#endif // __HAIKU__ +#else + #include "ViewDriver.h" +#endif //#define DEBUG_DESKTOP @@ -127,7 +130,8 @@ Desktop::AddDriver(DisplayDriver *driver) { if (driver->Initialize()) { // TODO: be careful of screen initialization - monitor may not support 640x480 - Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1); + Screen *sc = new Screen(driver, BPoint(1280, 1024), B_RGB32, fScreenList.CountItems()+1); +// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(640, 480), B_CMAP8, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(640, 480), B_GRAY8, fScreenList.CountItems()+1);