From 1cf94bf91f3b7d038b366ef9f270d09a73a0ad6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Wed, 18 Mar 2009 17:21:48 +0000
Subject: [PATCH] Cleaned up the include list. It's probably safest to include
 <Debug.h> before anything else.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29600 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/deskbar/BarMenuBar.cpp | 7 +++++--
 src/apps/deskbar/BarView.cpp    | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/apps/deskbar/BarMenuBar.cpp b/src/apps/deskbar/BarMenuBar.cpp
index 65e13f758d..637d7aa952 100644
--- a/src/apps/deskbar/BarMenuBar.cpp
+++ b/src/apps/deskbar/BarMenuBar.cpp
@@ -32,14 +32,17 @@ names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
 
-#include <string.h>
 #include <Debug.h>
+
+#include "BarMenuBar.h"
+
+#include <string.h>
+
 #include <Bitmap.h>
 #include <NodeInfo.h>
 
 #include "icons.h"
 #include "icons_logo.h"
-#include "BarMenuBar.h"
 #include "BarWindow.h"
 #include "BeMenu.h"
 #include "DeskBarUtils.h"
diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index 63893c9715..b04e6402b3 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -32,13 +32,16 @@ names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
 
+#include <Debug.h>
+
+#include "BarView.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <AppFileInfo.h>
 #include <Bitmap.h>
-#include <Debug.h>
 #include <Directory.h>
 #include <NodeInfo.h>
 #include <Roster.h>
@@ -47,7 +50,6 @@ All rights reserved.
 
 #include "icons.h"
 #include "BarApp.h"
-#include "BarView.h"
 #include "BarMenuBar.h"
 #include "BarWindow.h"
 #include "BeMenu.h"
@@ -139,7 +141,8 @@ TBarView::Draw(BRect)
 	if (Vertical() && Expando()) {
 		SetHighColor(hilite);
 		BRect frame(fExpando->Frame());
-		StrokeLine(frame.LeftTop() + BPoint(0, -1), frame.RightTop() + BPoint(0, -1));
+		StrokeLine(BPoint(frame.left, frame.top - 1),
+			BPoint(frame.right, frame.top -1));
 	}
 }