From 3dd9ff2b5d3a9c13e0fa87760efc29e6c929ac21 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Sat, 24 Aug 2013 20:12:39 -0400
Subject: [PATCH] BMCMenuBar: Refactor MakeFocus()

Get rid of unused fRunner variable.

It is very basic now, it just works.

Also, renamed msg to message in MessageReceived() and
declared MakeFocus() above it (alphabetically).
---
 headers/private/interface/BMCPrivate.h |  6 +---
 src/kits/interface/BMCPrivate.cpp      | 50 +++++++-------------------
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/headers/private/interface/BMCPrivate.h b/headers/private/interface/BMCPrivate.h
index ee6084998a..ebd18b5d3d 100644
--- a/headers/private/interface/BMCPrivate.h
+++ b/headers/private/interface/BMCPrivate.h
@@ -19,9 +19,6 @@
 static const float kVMargin = 2.0f;
 
 
-class BMessageRunner;
-
-
 class _BMCFilter_ : public BMessageFilter {
 public:
 								_BMCFilter_(BMenuField* menuField, uint32 what);
@@ -49,8 +46,8 @@ public:
 	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				MessageReceived(BMessage* message);
 	virtual	void				SetMaxContentWidth(float width);
 	virtual	void				SetEnabled(bool enabled);
 
@@ -69,7 +66,6 @@ private:
 
 			BMenuField*			fMenuField;
 			bool				fFixedSize;	
-			BMessageRunner*		fRunner;
 			bool				fShowPopUpMarker;
 			float				fPreviousWidth;
 };
diff --git a/src/kits/interface/BMCPrivate.cpp b/src/kits/interface/BMCPrivate.cpp
index 70a04135bc..68cf9afced 100644
--- a/src/kits/interface/BMCPrivate.cpp
+++ b/src/kits/interface/BMCPrivate.cpp
@@ -67,7 +67,6 @@ _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField* menuField)
 		!fixedSize),
 	fMenuField(menuField),
 	fFixedSize(fixedSize),
-	fRunner(NULL),
 	fShowPopUpMarker(true)
 {
 	_Init();
@@ -79,7 +78,6 @@ _BMCMenuBar_::_BMCMenuBar_(BMenuField* menuField)
 	BMenuBar("_mc_mb_", B_ITEMS_IN_ROW),
 	fMenuField(menuField),
 	fFixedSize(true),
-	fRunner(NULL),
 	fShowPopUpMarker(true)
 {
 	_Init();
@@ -91,7 +89,6 @@ _BMCMenuBar_::_BMCMenuBar_(BMessage* data)
 	BMenuBar(data),
 	fMenuField(NULL),
 	fFixedSize(true),
-	fRunner(NULL),
 	fShowPopUpMarker(true)
 {
 	SetFlags(Flags() | B_FRAME_EVENTS);
@@ -104,7 +101,6 @@ _BMCMenuBar_::_BMCMenuBar_(BMessage* data)
 
 _BMCMenuBar_::~_BMCMenuBar_()
 {
-	delete fRunner;
 }
 
 
@@ -215,9 +211,19 @@ _BMCMenuBar_::FrameResized(float width, float height)
 
 
 void
-_BMCMenuBar_::MessageReceived(BMessage* msg)
+_BMCMenuBar_::MakeFocus(bool focused)
 {
-	switch (msg->what) {
+	if (IsFocus() == focused)
+		return;
+
+	BMenuBar::MakeFocus(focused);
+}
+
+
+void
+_BMCMenuBar_::MessageReceived(BMessage* message)
+{
+	switch (message->what) {
 		case 'TICK':
 		{
 			BMenuItem* item = ItemAt(0);
@@ -235,42 +241,12 @@ _BMCMenuBar_::MessageReceived(BMessage* msg)
 		}
 		// fall through
 		default:
-			BMenuBar::MessageReceived(msg);
+			BMenuBar::MessageReceived(message);
 			break;
 	}
 }
 
 
-void
-_BMCMenuBar_::MakeFocus(bool focused)
-{
-	if (IsFocus() == focused)
-		return;
-
-	BMenuBar::MakeFocus(focused);
-
-	if (focused) {
-		BMessage message('TICK');
-		//fRunner = new BMessageRunner(BMessenger(this, NULL, NULL), &message,
-		//	50000, -1);
-	} else if (fRunner) {
-		//delete fRunner;
-		fRunner = NULL;
-	}
-
-	if (focused)
-		return;
-
-	fMenuField->fSelected = false;
-	fMenuField->fTransition = true;
-
-	BRect bounds(fMenuField->Bounds());
-
-	fMenuField->Invalidate(BRect(bounds.left, bounds.top, fMenuField->fDivider,
-		bounds.bottom));
-}
-
-
 void
 _BMCMenuBar_::SetMaxContentWidth(float width)
 {