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

* Moved PrivateScreen.h header to headers/private/interface.

Browse Source 
* Desktop is now including it as well to be able to use the new
  B_CURRENT_WORKSPACE_INDEX constant.
* Include order cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32558 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-08-21 09:37:54 +00:00
parent aadbd94ef7
commit f7e005eb83
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/kits/interface/PrivateScreen.h → headers/private/interface/PrivateScreen.h
View File

9
src/kits/interface/PrivateScreen.cpp
View File

@ -13,10 +13,7 @@
*/
#include "AppMisc.h"
#include "AppServerLink.h"
#include "PrivateScreen.h"
#include "ServerProtocol.h"
#include <PrivateScreen.h>
#include <new>
#include <stdlib.h>
@ -28,6 +25,10 @@
#include <ObjectList.h>
#include <Window.h>
#include <AppMisc.h>
#include <AppServerLink.h>
#include <ServerProtocol.h>
using namespace BPrivate;

5
src/kits/interface/Screen.cpp
View File

@ -11,11 +11,12 @@
/*! BScreen lets you retrieve and change the display settings. */
#include "PrivateScreen.h"
#include <Screen.h>
#include <Window.h>
#include <PrivateScreen.h>
using namespace BPrivate;

40
src/servers/app/Desktop.cpp
View File

@ -15,6 +15,23 @@
#include "Desktop.h"
#include <stdio.h>
#include <string.h>
#include <syslog.h>
#include <Debug.h>
#include <DirectWindow.h>
#include <Entry.h>
#include <Message.h>
#include <MessageFilter.h>
#include <Region.h>
#include <Roster.h>
#include <PrivateScreen.h>
#include <ServerProtocol.h>
#include <ViewPrivate.h>
#include <WindowInfo.h>
#include "AppServer.h"
#include "DesktopSettingsPrivate.h"
#include "DrawingEngine.h"
@ -31,26 +48,11 @@
#include "Workspace.h"
#include "WorkspacesView.h"
#include <ViewPrivate.h>
#include <WindowInfo.h>
#include <ServerProtocol.h>
#include <Debug.h>
#include <DirectWindow.h>
#include <Entry.h>
#include <Message.h>
#include <MessageFilter.h>
#include <Region.h>
#include <Roster.h>
#include <stdio.h>
#include <string.h>
#include <syslog.h>
#if TEST_MODE
# include "EventStream.h"
#endif
//#define DEBUG_DESKTOP
#ifdef DEBUG_DESKTOP
# define STRACE(a) printf a
@ -1125,8 +1127,7 @@ status_t
Desktop::SetScreenMode(int32 workspace, int32 id, const display_mode& mode,
bool makeDefault)
{
// ~0 is used as the current workspace in PrivateScreen
if (workspace == ~0)
if (workspace == B_CURRENT_WORKSPACE_INDEX)
workspace = fCurrentWorkspace;
if (workspace < 0 || workspace > kMaxWorkspaces)
@ -1184,8 +1185,7 @@ Desktop::SetScreenMode(int32 workspace, int32 id, const display_mode& mode,
status_t
Desktop::GetScreenMode(int32 workspace, int32 id, display_mode& mode)
{
// ~0 is used as the current workspace in PrivateScreen
if (workspace == ~0)
if (workspace == B_CURRENT_WORKSPACE_INDEX)
workspace = fCurrentWorkspace;
if (workspace < 0 || workspace > kMaxWorkspaces)