From fc2f1a32476ed6dc930dd757f228d728ba2b518e Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 18 Feb 2023 13:25:01 +0100 Subject: [PATCH] BMenuField: remove deprecated constructors These were introduced by mistake during the addition of the layout system. They have been private since 2011. It seems safe to assume that nothing uses them anymore and they can now be removed safely. Change-Id: I98d030096f9cb06fccc25233fe4da17d0213050e Reviewed-on: https://review.haiku-os.org/c/haiku/+/6075 Tested-by: Automation Reviewed-by: waddlesplash --- headers/os/interface/MenuField.h | 7 ------- src/kits/interface/MenuField.cpp | 27 --------------------------- 2 files changed, 34 deletions(-) diff --git a/headers/os/interface/MenuField.h b/headers/os/interface/MenuField.h index c91796a287..5963e7138c 100644 --- a/headers/os/interface/MenuField.h +++ b/headers/os/interface/MenuField.h @@ -113,13 +113,6 @@ private: friend class MenuBarLayoutItem; friend struct LayoutData; - BMenuField(const char* name, - const char* label, BMenu* menu, - BMessage* message, - uint32 flags); - BMenuField(const char* label, - BMenu* menu, BMessage* message); - void _DrawLabel(BRect updateRect); void _DrawMenuBar(BRect updateRect); diff --git a/src/kits/interface/MenuField.cpp b/src/kits/interface/MenuField.cpp index 8bf6193010..870e6b446f 100644 --- a/src/kits/interface/MenuField.cpp +++ b/src/kits/interface/MenuField.cpp @@ -259,33 +259,6 @@ BMenuField::BMenuField(const char* label, BMenu* menu, uint32 flags) } -//! Copy&Paste error, should be removed at some point (already private) -BMenuField::BMenuField(const char* name, const char* label, BMenu* menu, - BMessage* message, uint32 flags) - : - BView(name, flags | B_FRAME_EVENTS) -{ - InitObject(label); - - _InitMenuBar(menu, BRect(0, 0, 100, 15), true); - - InitObject2(); -} - - -//! Copy&Paste error, should be removed at some point (already private) -BMenuField::BMenuField(const char* label, BMenu* menu, BMessage* message) - : - BView(NULL, B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS) -{ - InitObject(label); - - _InitMenuBar(menu, BRect(0, 0, 100, 15), true); - - InitObject2(); -} - - BMenuField::BMenuField(BMessage* data) : BView(BUnarchiver::PrepareArchive(data))