From ef92b3dd4cef462499c13de98df2ab2ab8320e93 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Wed, 6 Nov 2013 19:26:19 -0500 Subject: [PATCH] BMenuBar: Update param names related to docs. No functional change intended. Renamed title => name in regular constructors, No right or wrong here but consistant now. Renamed data => archive in Achive constructor, Ditto. --- headers/os/interface/MenuBar.h | 6 +++--- src/kits/interface/MenuBar.cpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/headers/os/interface/MenuBar.h b/headers/os/interface/MenuBar.h index a825571f81..3a4a563e46 100644 --- a/headers/os/interface/MenuBar.h +++ b/headers/os/interface/MenuBar.h @@ -25,12 +25,12 @@ class BMenuField; class BMenuBar : public BMenu { public: - BMenuBar(BRect frame, const char* title, - uint32 resizeMask = B_FOLLOW_LEFT_RIGHT + BMenuBar(BRect frame, const char* name, + uint32 resizingMode = B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP, menu_layout layout = B_ITEMS_IN_ROW, bool resizeToFit = true); - BMenuBar(const char* title, + BMenuBar(const char* name, menu_layout layout = B_ITEMS_IN_ROW, uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS); diff --git a/src/kits/interface/MenuBar.cpp b/src/kits/interface/MenuBar.cpp index 139123e5cd..36840a0a59 100644 --- a/src/kits/interface/MenuBar.cpp +++ b/src/kits/interface/MenuBar.cpp @@ -44,10 +44,10 @@ struct menubar_data { }; -BMenuBar::BMenuBar(BRect frame, const char* title, uint32 resizeMask, +BMenuBar::BMenuBar(BRect frame, const char* name, uint32 resizingMode, menu_layout layout, bool resizeToFit) : - BMenu(frame, title, resizeMask, B_WILL_DRAW | B_FRAME_EVENTS + BMenu(frame, name, resizingMode, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE, layout, resizeToFit), fBorder(B_BORDER_FRAME), fTrackingPID(-1), @@ -60,9 +60,9 @@ BMenuBar::BMenuBar(BRect frame, const char* title, uint32 resizeMask, } -BMenuBar::BMenuBar(const char* title, menu_layout layout, uint32 flags) +BMenuBar::BMenuBar(const char* name, menu_layout layout, uint32 flags) : - BMenu(BRect(), title, B_FOLLOW_NONE, + BMenu(BRect(), name, B_FOLLOW_NONE, flags | B_WILL_DRAW | B_FRAME_EVENTS | B_SUPPORTS_LAYOUT, layout, false), fBorder(B_BORDER_FRAME), @@ -76,9 +76,9 @@ BMenuBar::BMenuBar(const char* title, menu_layout layout, uint32 flags) } -BMenuBar::BMenuBar(BMessage* data) +BMenuBar::BMenuBar(BMessage* archive) : - BMenu(data), + BMenu(archive), fBorder(B_BORDER_FRAME), fTrackingPID(-1), fPrevFocusToken(-1), @@ -88,11 +88,11 @@ BMenuBar::BMenuBar(BMessage* data) { int32 border; - if (data->FindInt32("_border", &border) == B_OK) + if (archive->FindInt32("_border", &border) == B_OK) SetBorder((menu_bar_border)border); menu_layout layout = B_ITEMS_IN_COLUMN; - data->FindInt32("_layout", (int32*)&layout); + archive->FindInt32("_layout", (int32*)&layout); _InitData(layout); }