From 206df9cd045c298ec05b4c314c2e0de4cfae6bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Fri, 22 Dec 2006 11:17:16 +0000
Subject: [PATCH] Removed choice of separator style - there is only one to rule
 them all, now.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19606 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/preferences/menu/MenuBar.cpp | 37 +++++++-------------------------
 src/preferences/menu/MenuBar.h   |  4 ----
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/preferences/menu/MenuBar.cpp b/src/preferences/menu/MenuBar.cpp
index 1766595db9..46eeb770d9 100644
--- a/src/preferences/menu/MenuBar.cpp
+++ b/src/preferences/menu/MenuBar.cpp
@@ -60,34 +60,20 @@ MenuBar::_BuildMenu()
 	BMenuItem* colorSchemeItem = new BMenuItem("Color Scheme...",
 		new BMessage(COLOR_SCHEME_OPEN_MSG), 0, 0);
 
-	// create the separator menu
-	BMenu* separatorStyleMenu = new BMenu("Separator Style", B_ITEMS_IN_COLUMN);
-	separatorStyleMenu->SetRadioMode(true);
-	BMessage *msg = new BMessage(MENU_SEP_TYPE);
-	msg->AddInt32("sep", 0);
-	separatorStyleZero = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP0"));
-	msg = new BMessage(MENU_SEP_TYPE);
-	msg->AddInt32("sep", 1);
-	separatorStyleOne = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP1"));
-	msg = new BMessage(MENU_SEP_TYPE);
-	msg->AddInt32("sep", 2);
-	separatorStyleTwo = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP2"));
-
-	separatorStyleMenu->AddItem(separatorStyleZero);
-	separatorStyleMenu->AddItem(separatorStyleOne);
-	separatorStyleMenu->AddItem(separatorStyleTwo);
-	separatorStyleMenu->SetRadioMode(true);
-	separatorStyleMenu->SetTargetForItems(Window());
-
 	// Add items to menubar	
 	AddItem(fontMenu, 0);
 	AddItem(fontSizeMenu, 1);
+
 	AddSeparatorItem();
-	AddItem(fAlwaysShowTriggersItem);
-	AddSeparatorItem();
+
 	AddItem(colorSchemeItem);
-	AddItem(separatorStyleMenu);
+
 	AddSeparatorItem();
+
+	AddItem(fAlwaysShowTriggersItem);
+
+	AddSeparatorItem();
+
 	AddItem(fControlAsShortcutItem);
 	AddItem(fAltAsShortcutItem);
 }
@@ -113,13 +99,6 @@ MenuBar::UpdateMenu()
 
 	fAltAsShortcutItem->SetMarked(altAsShortcut); 
 	fControlAsShortcutItem->SetMarked(!altAsShortcut); 
-
-	if (info.separator == 0)
-		separatorStyleZero->SetMarked(true);
-	else if (info.separator == 1)
-		separatorStyleOne->SetMarked(true);
-	else if (info.separator == 2)
-		separatorStyleTwo->SetMarked(true);
 }
 
 
diff --git a/src/preferences/menu/MenuBar.h b/src/preferences/menu/MenuBar.h
index cd0ba382f2..e2a9ad5eee 100644
--- a/src/preferences/menu/MenuBar.h
+++ b/src/preferences/menu/MenuBar.h
@@ -27,10 +27,6 @@ class MenuBar : public BMenuBar {
 	private:	
 		void _BuildMenu();
 
-		BMenuItem*	separatorStyleZero;
-		BMenuItem*	separatorStyleOne;
-		BMenuItem*	separatorStyleTwo;
-
 		BMenuItem*	fAlwaysShowTriggersItem;
 		BMenuItem*	fControlAsShortcutItem;
 		BMenuItem*	fAltAsShortcutItem;