From da6286856f8eb9fbbf5845da09e314513eba74c8 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Mon, 9 Jan 2017 02:31:32 -0800 Subject: [PATCH] Revert "Deskbar: Inital FetchIcon() in AttachedToWindow()" This reverts commit 52e243a7d1c952fa3dff316cadf0b9fdde5f4c4c. --- src/apps/deskbar/BarMenuBar.cpp | 10 +--------- src/apps/deskbar/BarMenuBar.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/apps/deskbar/BarMenuBar.cpp b/src/apps/deskbar/BarMenuBar.cpp index 70895c6ef2..2211d6b772 100644 --- a/src/apps/deskbar/BarMenuBar.cpp +++ b/src/apps/deskbar/BarMenuBar.cpp @@ -111,6 +111,7 @@ TBarMenuBar::TBarMenuBar(BRect frame, const char* name, TBarView* barView) fDeskbarMenuItem = new TDeskbarMenuTitle(frame.Width(), frame.Height(), NULL, beMenu); + fDeskbarMenuItem->FetchIcon(); AddItem(fDeskbarMenuItem); } @@ -120,15 +121,6 @@ TBarMenuBar::~TBarMenuBar() } -void -TBarMenuBar::AttachedToWindow() -{ - fDeskbarMenuItem->FetchIcon(); - - BMenuBar::AttachedToWindow(); -} - - void TBarMenuBar::SmartResize(float width, float height) { diff --git a/src/apps/deskbar/BarMenuBar.h b/src/apps/deskbar/BarMenuBar.h index 1d3c79c91c..0a16c722d7 100644 --- a/src/apps/deskbar/BarMenuBar.h +++ b/src/apps/deskbar/BarMenuBar.h @@ -62,8 +62,6 @@ public: TBarView* barView); virtual ~TBarMenuBar(); - virtual void AttachedToWindow(); - virtual void MouseMoved(BPoint where, uint32 code, const BMessage* message);