Minor header-related changes

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3246 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/interface/Menu.h

@@ -171,9 +171,9 @@ virtual void		DrawBackground(BRect update);
 						
 /*----- Private or reserved -----------------------------------------*/
 private:
-friend BWindow;
-friend BMenuBar;
-friend BMenuItem;
+friend class BWindow;
+friend class BMenuBar;
+friend class BMenuItem;
 friend status_t _init_interface_kit_();
 friend status_t	set_menu_info(menu_info *);
 friend status_t	get_menu_info(menu_info *);

headers/os/interface/MenuBar.h

@@ -80,10 +80,10 @@ virtual void			AllDetached();
 virtual status_t		Perform(perform_code d, void *arg);
 
 private:
-friend BWindow;
-friend BMenuItem;
-friend BMenuField;
-friend BMenu;
+friend class BWindow;
+friend class BMenuItem;
+friend class BMenuField;
+friend class BMenu;
 
 virtual	void			_ReservedMenuBar1();
 virtual	void			_ReservedMenuBar2();

headers/os/interface/MenuItem.h

@@ -65,9 +65,9 @@ virtual	void			Highlight(bool on);
 
 /*----- Private or reserved -----------------------------------------*/
 private:
-friend	BMenu;
-friend	BPopUpMenu;
-friend	BMenuBar;
+friend class BMenu;
+friend class BPopUpMenu;
+friend class BMenuBar;
 
 virtual	void		_ReservedMenuItem1();
 virtual	void		_ReservedMenuItem2();

headers/os/interface/Shape.h

@@ -74,9 +74,9 @@ virtual	void			_ReservedShape2();
 virtual	void			_ReservedShape3();
 virtual	void			_ReservedShape4();
 
-		friend			BShapeIterator;
+		friend class	BShapeIterator;
 		friend class	TPicture;
-		friend			BView;
+		friend class	BView;
 		friend class	BFont;
 		void			GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList);
 		void			SetData(int32 opCount, int32 ptCount, uint32 *opList, BPoint *ptList);

headers/os/support/Autolock.h

@@ -1,5 +1,5 @@
 //
-//	$Id: Autolock.h,v 1.1 2002/07/09 12:24:33 ejakowatz Exp $
+//	$Id: Autolock.h,v 1.2 2003/05/14 17:21:46 haydentech Exp $
 //
 //	This is the BAutolock interface for OpenBeOS.  It has been created to
 //	be source and binary compatible with the BeOS version of BAutolock.
@@ -11,7 +11,7 @@
 #define	_OPENBEOS_AUTOLOCK_H
 
 
-#include "Locker.h"
+#include <Locker.h>
 #include <Looper.h>
 
 

headers/os/support/Debug.h

@@ -15,7 +15,7 @@
 #include <SupportDefs.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <OS.h>
 
 /*------------------------------*/

headers/os/support/StopWatch.h

@@ -2,7 +2,7 @@
 #define _BLUE_STOP_WATCH_H
 
 #include <BeBuild.h>
-#include "support/SupportDefs.h"
+#include <SupportDefs.h>
 
 #ifdef USE_OPENBEOS_NAMESPACE
 namespace OpenBeOS {

headers/os/support/SupportDefs.h

@@ -40,7 +40,7 @@ typedef unsigned short			ushort;
 // System Includes -------------------------------------------------------------
 #include <BeBuild.h>
 #include <sys/types.h>
-#include <support/Errors.h>
+#include <Errors.h>
 
 // Project Includes ------------------------------------------------------------
 

src/kits/app/MessageQueue.cpp

@@ -1,14 +1,14 @@
 //
-//  $Id: MessageQueue.cpp,v 1.2 2002/09/28 09:49:34 shatty Exp $
+//  $Id: MessageQueue.cpp,v 1.3 2003/05/14 17:21:46 haydentech Exp $
 //
 //  This file contains the implementation of the BMessageQueue class
 //  for the OpenBeOS project.
 //
 
 
-#include "MessageQueue.h"
-#include "Autolock.h"
-#include "Message.h"
+#include <MessageQueue.h>
+#include <Autolock.h>
+#include <Message.h>
 
 #ifdef USE_OPENBEOS_NAMESPACE
 namespace OpenBeOS {

src/kits/interface/ColorControl.cpp

@@ -28,9 +28,9 @@
 #include <stdio.h>
 
 // System Includes -------------------------------------------------------------
-#include "ColorControl.h"
-#include "TextControl.h"
-#include <Support/Errors.h>
+#include <ColorControl.h>
+#include <TextControl.h>
+#include <Errors.h>
 
 // Project Includes ------------------------------------------------------------
 

src/kits/interface/Control.cpp

@@ -26,7 +26,7 @@
 
 // Standard Includes -----------------------------------------------------------
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 // System Includes -------------------------------------------------------------
 #include <Control.h>

src/kits/interface/MenuItem.cpp

@@ -1,6 +1,6 @@
 // Standard Includes -----------------------------------------------------------
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 // System Includes -------------------------------------------------------------
 #include <MenuItem.h>

src/kits/interface/Picture.cpp

@@ -27,7 +27,7 @@
 
 // Standard Includes -----------------------------------------------------------
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 // System Includes -------------------------------------------------------------
 #include <Picture.h>

src/kits/interface/ScrollBar.cpp

@@ -172,7 +172,7 @@ BArchivable *BScrollBar::Instantiate(BMessage *data)
 	return NULL;
 }
 
-status_t BScrollBar::Archive(BMessage *data, bool deep = true) const
+status_t BScrollBar::Archive(BMessage *data, bool deep) const
 {
 	return B_ERROR;
 }
@@ -481,6 +481,10 @@ void BScrollBar::ResizeToPreferred()
 
 void BScrollBar::GetPreferredSize(float *width, float *height)
 {
+	if (fOrientation == B_VERTICAL)
+		*width = B_V_SCROLL_BAR_WIDTH;
+	else if (fOrientation == B_HORIZONTAL)
+		*height = B_H_SCROLL_BAR_HEIGHT;
 }
 
 void BScrollBar::MakeFocus(bool state)

src/kits/interface/Shape.cpp

@@ -24,11 +24,11 @@
 //	Description:	BShape encapsulates a Postscript-style "path"
 //------------------------------------------------------------------------------
 
-#include "Shape.h"
-#include "Point.h"
-#include "Rect.h"
-#include <Support/Errors.h>
-#include <App/Message.h>
+#include <Shape.h>
+#include <Point.h>
+#include <Rect.h>
+#include <Errors.h>
+#include <Message.h>
 
 #define OP_LINETO		0x10000000
 #define OP_BEZIERTO		0x20000000

src/kits/interface/Slider.cpp

@@ -25,7 +25,7 @@
 //------------------------------------------------------------------------------
 
 // Standard Includes -----------------------------------------------------------
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 // System Includes -------------------------------------------------------------

src/kits/interface/StatusBar.cpp

@@ -26,7 +26,7 @@
 
 // Standard Includes -----------------------------------------------------------
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 // System Includes -------------------------------------------------------------
 #include <StatusBar.h>