From 0bb8508592c9cc91ade0f4cb5244c474fac327b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 5 Jul 2005 18:38:12 +0000 Subject: [PATCH] Stippi's commit accidently changed the initial screen size. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13457 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index ab0a19ac10..6f84dc7b91 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -32,15 +32,15 @@ #include "Workspace.h" #ifdef __HAIKU__ -#define USE_ACCELERANT 1 +# define USE_ACCELERANT 1 #else -#define USE_ACCELERANT 0 +# define USE_ACCELERANT 0 #endif #if USE_ACCELERANT - #include "AccelerantHWInterface.h" +# include "AccelerantHWInterface.h" #else - #include "ViewHWInterface.h" +# include "ViewHWInterface.h" #endif #include "Desktop.h" @@ -48,9 +48,9 @@ //#define DEBUG_DESKTOP #ifdef DEBUG_DESKTOP - #define STRACE(a) printf(a) +# define STRACE(a) printf(a) #else - #define STRACE(a) /* nothing */ +# define STRACE(a) /* nothing */ #endif @@ -136,17 +136,10 @@ Desktop::_AddGraphicsCard(HWInterface* interface) // The interface is now owned by the screen if (screen->Initialize() >= B_OK && fScreenList.AddItem((void*)screen)) { - // TODO: be careful of screen initialization - monitor may not support 640x480 -#if __HAIKU__ - screen->SetMode(1400, 1050, B_RGB32, 60.f); -#else screen->SetMode(800, 600, B_RGB32, 60.f); -#endif - - } else { + } else delete screen; - } }