diff --git a/headers/private/interface/BMCPrivate.h b/headers/private/interface/BMCPrivate.h
index b3ec5d87c9..dc97ba3fa9 100644
--- a/headers/private/interface/BMCPrivate.h
+++ b/headers/private/interface/BMCPrivate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku, Inc.
+ * Copyright 2001-2009 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -20,44 +20,52 @@ class BMessageRunner;
 
 class _BMCFilter_ : public BMessageFilter {
 public:
-	_BMCFilter_(BMenuField *menuField, uint32 what);
-	virtual ~_BMCFilter_();
-	filter_result Filter(BMessage *message, BHandler **handler);
+								_BMCFilter_(BMenuField* menuField, uint32 what);
+	virtual						~_BMCFilter_();
+
+	virtual	filter_result		Filter(BMessage* message, BHandler** handler);
 
 private:
-	_BMCFilter_ &operator=(const _BMCFilter_ &);
-	BMenuField *fMenuField;
+			_BMCFilter_&		operator=(const _BMCFilter_&);
+
+			BMenuField*			fMenuField;
 };
 
 
 class _BMCMenuBar_ : public BMenuBar {
 public:
-					_BMCMenuBar_(BRect frame, bool fixed_size,
-						BMenuField *menuField);
-					_BMCMenuBar_(BMessage *data);
-	virtual			~_BMCMenuBar_();
+								_BMCMenuBar_(BRect frame, bool fixedSize,
+									BMenuField* menuField);
+								_BMCMenuBar_(bool fixedSize,
+									BMenuField* menuField);
+								_BMCMenuBar_(BMessage* data);
+	virtual						~_BMCMenuBar_();
 
-	static	BArchivable	*Instantiate(BMessage *data);
+	static	BArchivable*		Instantiate(BMessage* data);
 
-	virtual	void	AttachedToWindow();
-	virtual	void	Draw(BRect updateRect);
-	virtual	void	FrameResized(float width, float height);
-	virtual	void	MessageReceived(BMessage* msg);
-	virtual	void	MakeFocus(bool focused = true);
+	virtual	void				AttachedToWindow();
+	virtual	void				Draw(BRect updateRect);
+	virtual	void				FrameResized(float width, float height);
+	virtual	void				MessageReceived(BMessage* msg);
+	virtual	void				MakeFocus(bool focused = true);
 
-			void	TogglePopUpMarker(bool show) { fShowPopUpMarker = show; }
-			bool	IsPopUpMarkerShown() const { return fShowPopUpMarker; }
+			void				TogglePopUpMarker(bool show)
+									{ fShowPopUpMarker = show; }
+			bool				IsPopUpMarkerShown() const
+									{ return fShowPopUpMarker; }
 
-	virtual	BSize	MaxSize();
+	virtual	BSize				MaxSize();
 
 private:
-					_BMCMenuBar_&operator=(const _BMCMenuBar_ &);
+								_BMCMenuBar_&operator=(const _BMCMenuBar_&);
 
-		BMenuField	*fMenuField;
-		bool		fFixedSize;	
-		BMessageRunner *fRunner;
-		bool		fShowPopUpMarker;
-		float		fPreviousWidth;
+			void				_Init(bool setMaxContentWidth);
+
+			BMenuField*			fMenuField;
+			bool				fFixedSize;	
+			BMessageRunner*		fRunner;
+			bool				fShowPopUpMarker;
+			float				fPreviousWidth;
 };
 
 #endif // _BMC_PRIVATE_H