diff --git a/headers/os/interface/PopUpMenu.h b/headers/os/interface/PopUpMenu.h
index 87d12f547c..153d94024d 100644
--- a/headers/os/interface/PopUpMenu.h
+++ b/headers/os/interface/PopUpMenu.h
@@ -1,84 +1,82 @@
 /*
- * Copyright 2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2007-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _POP_UP_MENU_H
 #define _POP_UP_MENU_H
 
+
 #include <BeBuild.h>
 #include <Menu.h>
 
+
 class BPopUpMenu : public BMenu {
-	public:
-		BPopUpMenu(const char *title, bool radioMode = true,
-					bool autoRename = true,
-					menu_layout layout = B_ITEMS_IN_COLUMN);
-		BPopUpMenu(BMessage *data);
-		virtual	~BPopUpMenu();
-		
-		virtual status_t	Archive(BMessage *data, bool deep = true) const;
-		static BArchivable*	Instantiate(BMessage *data);
+public:
+						BPopUpMenu(const char* title, bool radioMode = true,
+							bool autoRename = true,
+							menu_layout layout = B_ITEMS_IN_COLUMN);
+						BPopUpMenu(BMessage* data);
+	virtual				~BPopUpMenu();
 
-		BMenuItem*		Go(BPoint where, bool autoInvoke = false,
-						bool keepOpen = false,
-						bool async = false);
-		BMenuItem*		Go(BPoint where, bool autoInvoke,
-						bool keepOpen,
-						BRect openRect,
-						bool async = false);
+	virtual status_t	Archive(BMessage* data, bool deep = true) const;
+	static BArchivable*	Instantiate(BMessage* data);
 
-		virtual void		MessageReceived(BMessage *message);
-		virtual	void		MouseDown(BPoint point);
-		virtual	void		MouseUp(BPoint point);
-		virtual	void		MouseMoved(BPoint point, uint32 code,
-							const BMessage *message);
-		virtual	void		AttachedToWindow();
-		virtual	void		DetachedFromWindow();
-		virtual	void		FrameMoved(BPoint newPosition);
-		virtual	void		FrameResized(float newWidth, float newHeight);
+			BMenuItem*	Go(BPoint where, bool autoInvoke = false,
+							bool keepOpen = false, bool async = false);
+			BMenuItem*	Go(BPoint where, bool autoInvoke, bool keepOpen,
+							BRect openRect, bool async = false);
 
-		virtual BHandler*	ResolveSpecifier(BMessage *message, int32 index,
-							BMessage *specifier, int32 form,
-							const char *property);
-		virtual status_t	GetSupportedSuites(BMessage *data);
+	virtual void		MessageReceived(BMessage* message);
+	virtual	void		MouseDown(BPoint point);
+	virtual	void		MouseUp(BPoint point);
+	virtual	void		MouseMoved(BPoint point, uint32 code,
+							const BMessage* message);
+	virtual	void		AttachedToWindow();
+	virtual	void		DetachedFromWindow();
+	virtual	void		FrameMoved(BPoint newPosition);
+	virtual	void		FrameResized(float newWidth, float newHeight);
 
-		virtual status_t	Perform(perform_code code, void *arg);
+	virtual BHandler*	ResolveSpecifier(BMessage* message, int32 index,
+							BMessage* specifier, int32 form,
+							const char* property);
+	virtual status_t	GetSupportedSuites(BMessage* data);
 
-		virtual void		ResizeToPreferred();
-		virtual void		GetPreferredSize(float *width, float *height);
-		virtual void		MakeFocus(bool state = true);
-		virtual void		AllAttached();
-		virtual void		AllDetached();
+	virtual status_t	Perform(perform_code code, void* arg);
 
-		void			SetAsyncAutoDestruct(bool state);
-		bool			AsyncAutoDestruct() const;
+	virtual void		ResizeToPreferred();
+	virtual void		GetPreferredSize(float* _width, float* _height);
+	virtual void		MakeFocus(bool state = true);
+	virtual void		AllAttached();
+	virtual void		AllDetached();
 
-	protected:
-		virtual	BPoint		ScreenLocation();
+			void		SetAsyncAutoDestruct(bool state);
+			bool		AsyncAutoDestruct() const;
 
-		virtual	void		_ReservedPopUpMenu1();
-		virtual	void		_ReservedPopUpMenu2();
-		virtual	void		_ReservedPopUpMenu3();
+protected:
+	virtual	BPoint		ScreenLocation();
 
-		BPopUpMenu	&operator=(const BPopUpMenu &);
+	virtual	void		_ReservedPopUpMenu1();
+	virtual	void		_ReservedPopUpMenu2();
+	virtual	void		_ReservedPopUpMenu3();
 
-	private:
-		BMenuItem	*_Go(BPoint where, bool autoInvoke, bool startOpened,
-							BRect *specialRect, bool async);
-		BMenuItem	*_StartTrack(BPoint where, bool autoInvoke,
-						bool startOpened, BRect *specialRect);
-		BMenuItem	*_WaitMenu(void *data);
+			BPopUpMenu&	operator=(const BPopUpMenu& other);
 
-		static	int32	_thread_entry(void *);
+private:
+			BMenuItem*	_Go(BPoint where, bool autoInvoke, bool startOpened,
+							BRect* specialRect, bool async);
+			BMenuItem*	_StartTrack(BPoint where, bool autoInvoke,
+							bool startOpened, BRect* specialRect);
+			BMenuItem*	_WaitMenu(void* data);
 
-		BPoint		fWhere;
-		bool		fUseWhere;
-		bool		fAutoDestruct;
-		bool		_fUnusedBool1;
-		bool		_fUnusedBool2;
-		thread_id	fTrackThread;
-		uint32		_reserved[3];
+	static	int32		_thread_entry(void* data);
+
+	BPoint				fWhere;
+	bool				fUseWhere;
+	bool				fAutoDestruct;
+	bool				_fUnusedBool1;
+	bool				_fUnusedBool2;
+	thread_id			fTrackThread;
+	uint32				_reserved[3];
 };
 
-
-#endif /* _POP_UP_MENU_H */
+#endif	// _POP_UP_MENU_H