From 12194e33b720dd4785c9ca34e06b807d91c36566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Fri, 7 Aug 2009 08:52:32 +0000
Subject: [PATCH] * Added missing default initializer for the message. *
 Changed BMenuField::MenuBarLayoutItem::BasePreferredSize() to return the  
 min size as well, instead of a fixed 100 pixels for the width... * More minor
 cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32177 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/interface/MenuField.h |  2 +-
 src/kits/interface/Menu.cpp      |  9 ++++++---
 src/kits/interface/MenuField.cpp | 15 +++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/headers/os/interface/MenuField.h b/headers/os/interface/MenuField.h
index dd237aee6b..a6fb4bdacf 100644
--- a/headers/os/interface/MenuField.h
+++ b/headers/os/interface/MenuField.h
@@ -27,7 +27,7 @@ public:
 								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* name,
 								const char* label, BMenu* menu,
-								BMessage* message,
+								BMessage* message = NULL,
 								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* label,
 								BMenu* menu, BMessage* message = NULL);
diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 878b094d10..008ebe3b89 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -184,7 +184,8 @@ struct BMenu::LayoutData {
 
 
 BMenu::BMenu(const char* name, menu_layout layout)
-	: BView(BRect(0, 0, 0, 0), name, 0, B_WILL_DRAW),
+	:
+	BView(BRect(0, 0, 0, 0), name, 0, B_WILL_DRAW),
 	fChosenItem(NULL),
 	fPad(14.0f, 2.0f, 20.0f, 0.0f),
 	fSelected(NULL),
@@ -218,7 +219,8 @@ BMenu::BMenu(const char* name, menu_layout layout)
 
 
 BMenu::BMenu(const char* name, float width, float height)
-	: BView(BRect(0.0f, width, 0.0f, height), name, 0, B_WILL_DRAW),
+	:
+	BView(BRect(0.0f, width, 0.0f, height), name, 0, B_WILL_DRAW),
 	fChosenItem(NULL),
 	fSelected(NULL),
 	fCachedMenuWindow(NULL),
@@ -263,7 +265,8 @@ BMenu::~BMenu()
 
 
 BMenu::BMenu(BMessage* archive)
-	: BView(archive),
+	:
+	BView(archive),
 	fChosenItem(NULL),
 	fPad(14.0f, 2.0f, 20.0f, 0.0f),
 	fSelected(NULL),
diff --git a/src/kits/interface/MenuField.cpp b/src/kits/interface/MenuField.cpp
index 9262d47556..c485e96ae9 100644
--- a/src/kits/interface/MenuField.cpp
+++ b/src/kits/interface/MenuField.cpp
@@ -1136,8 +1136,9 @@ BMenuField::_MenuBarWidth() const
 
 
 BMenuField::LabelLayoutItem::LabelLayoutItem(BMenuField* parent)
-	: fParent(parent),
-	  fFrame()
+	:
+	fParent(parent),
+	fFrame()
 {
 }
 
@@ -1216,8 +1217,9 @@ BMenuField::LabelLayoutItem::BaseAlignment()
 
 
 BMenuField::MenuBarLayoutItem::MenuBarLayoutItem(BMenuField* parent)
-	: fParent(parent),
-	  fFrame()
+	:
+	fParent(parent),
+	fFrame()
 {
 	// by default the part right of the divider shall have an unlimited maximum
 	// width
@@ -1286,10 +1288,7 @@ BMenuField::MenuBarLayoutItem::BaseMaxSize()
 BSize
 BMenuField::MenuBarLayoutItem::BasePreferredSize()
 {
-	BSize size(BaseMinSize());
-	// puh, no idea...
-	size.width = 100;
-	return size;
+	return BaseMinSize();
 }