From 15b9bc4f1b4ad72c6b96d02d39c00fcbd89e2100 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Tue, 20 Nov 2007 12:59:17 +0000
Subject: [PATCH] small cleanups

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22964 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/BMCPrivate.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/kits/interface/BMCPrivate.cpp b/src/kits/interface/BMCPrivate.cpp
index 5193681ee3..2170973508 100644
--- a/src/kits/interface/BMCPrivate.cpp
+++ b/src/kits/interface/BMCPrivate.cpp
@@ -14,6 +14,7 @@
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Message.h>
+#include <MessageRunner.h>
 #include <Region.h>
 #include <Window.h>
 
@@ -57,18 +58,16 @@ _BMCFilter_::operator=(const _BMCFilter_ &)
 
 _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField *menuField)
 	: BMenuBar(frame, "_mc_mb_", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_ITEMS_IN_ROW,
-		!fixedSize)
+		!fixedSize),
+	fMenuField(menuField),
+	fFixedSize(fixedSize),
+	fRunner(NULL),
+	fShowPopUpMarker(true)
 {
 	SetFlags(Flags() | B_FRAME_EVENTS);
 	SetBorder(B_BORDER_CONTENTS);
 
-	fMenuField = menuField;
-	fFixedSize = fixedSize;
-	fRunner = NULL;
-	fShowPopUpMarker = true;
-
 	float left, top, right, bottom;
-
 	GetItemMargins(&left, &top, &right, &bottom);
 	// give a bit more space to draw the small thumb
 	left -= 1;
@@ -82,21 +81,23 @@ _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField *menuField)
 
 
 _BMCMenuBar_::_BMCMenuBar_(BMessage *data)
-	:	BMenuBar(data)
+	:	BMenuBar(data),
+	fMenuField(NULL),
+	fFixedSize(true),
+	fRunner(NULL),
+	fShowPopUpMarker(true)
 {
 	SetFlags(Flags() | B_FRAME_EVENTS);
 
-	bool rsize_to_fit;
-
-	if (data->FindBool("_rsize_to_fit", &rsize_to_fit) == B_OK)
-		fFixedSize = !rsize_to_fit;
-	else
-		fFixedSize = true;
+	bool resizeToFit;
+	if (data->FindBool("_rsize_to_fit", &resizeToFit) == B_OK)
+		fFixedSize = !resizeToFit;
 }
 
 
 _BMCMenuBar_::~_BMCMenuBar_()
 {
+	delete fRunner;
 }