From 5364573ebd8e7d385cd688ada041a5adbc90d309 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 14 Jan 2006 21:50:35 +0000 Subject: [PATCH] Partially reverted to 15464 to have less code duplication, now that the special case is handled in BMenu::CalcFrame() git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15944 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/BMCPrivate.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/kits/interface/BMCPrivate.cpp b/src/kits/interface/BMCPrivate.cpp index e6b91d0095..9a3f464ac9 100644 --- a/src/kits/interface/BMCPrivate.cpp +++ b/src/kits/interface/BMCPrivate.cpp @@ -66,15 +66,7 @@ _BMCItem_::Draw() { BMenu *menu = Menu(); - // Copy / pasted from BMenuItem::Draw(). We can't use it directly - // because we want to skip the Submenu symbol and the rest - if (IsEnabled()) - menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR)); - else - menu->SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), - B_DISABLED_LABEL_TINT)); - menu->MovePenTo(ContentLocation()); - DrawContent(); + BMenuItem::Draw(); if (!fShowPopUpMarker) return; @@ -133,7 +125,7 @@ _BMCFilter_::operator=(const _BMCFilter_ &) _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixed_size, BMenuField *menuField) - : BMenuBar(frame, "_mc_mb_", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_ITEMS_IN_COLUMN, + : BMenuBar(frame, "_mc_mb_", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_ITEMS_IN_ROW, !fixed_size) { SetFlags(Flags() | B_FRAME_EVENTS);