TEST_MODE is now disabled on Haiku too. So app_server is not a BApplication anymore and doesn't depend on itself.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12131 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -4,7 +4,9 @@
|
|||||||
// This is defined to place the server in test mode, which modifies certain things like
|
// This is defined to place the server in test mode, which modifies certain things like
|
||||||
// system keyboard shortcuts. Note that it is possible, though senseless, to place it in
|
// system keyboard shortcuts. Note that it is possible, though senseless, to place it in
|
||||||
// regular mode and still use a display driver which depends on the R5 app_server
|
// regular mode and still use a display driver which depends on the R5 app_server
|
||||||
#define TEST_MODE
|
#ifndef TEST_MODE
|
||||||
|
#define TEST_MODE 1
|
||||||
|
#endif
|
||||||
|
|
||||||
// The ViewDriver is a BView/BWindow combination. Plenty of functionality,
|
// The ViewDriver is a BView/BWindow combination. Plenty of functionality,
|
||||||
// but dog-slow.
|
// but dog-slow.
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ ColorSet gui_colorset;
|
|||||||
This loads the default fonts, allocates all the major global variables, spawns the main housekeeping
|
This loads the default fonts, allocates all the major global variables, spawns the main housekeeping
|
||||||
threads, loads user preferences for the UI and decorator, and allocates various locks.
|
threads, loads user preferences for the UI and decorator, and allocates various locks.
|
||||||
*/
|
*/
|
||||||
#ifdef TEST_MODE
|
#if TEST_MODE
|
||||||
AppServer::AppServer(void) : BApplication (SERVER_SIGNATURE)
|
AppServer::AppServer(void) : BApplication (SERVER_SIGNATURE)
|
||||||
#else
|
#else
|
||||||
AppServer::AppServer(void)
|
AppServer::AppServer(void)
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ class BitmapManager;
|
|||||||
application start and quit messages. It also starts the housekeeping threads
|
application start and quit messages. It also starts the housekeeping threads
|
||||||
and initializes most of the server's globals.
|
and initializes most of the server's globals.
|
||||||
*/
|
*/
|
||||||
#ifndef TEST_MODE
|
#if TEST_MODE
|
||||||
class AppServer
|
|
||||||
#else
|
|
||||||
class AppServer : public BApplication
|
class AppServer : public BApplication
|
||||||
|
#else
|
||||||
|
class AppServer
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|||||||
Reference in New Issue
Block a user