i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMenuBar: Update param names related to docs.

Browse Source 
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.
This commit is contained in:
John Scipione
2013-11-06 19:26:19 -05:00
parent 0d635255f5
commit ef92b3dd4c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/MenuBar.h
+3 -3
View File
@@ -25,12 +25,12 @@ class BMenuField;
class BMenuBar : public BMenu { class BMenuBar : public BMenu {
public: public:
BMenuBar(BRect frame, const char* title, BMenuBar(BRect frame, const char* name,
uint32 resizeMask = B_FOLLOW_LEFT_RIGHT uint32 resizingMode = B_FOLLOW_LEFT_RIGHT
| B_FOLLOW_TOP, | B_FOLLOW_TOP,
menu_layout layout = B_ITEMS_IN_ROW, menu_layout layout = B_ITEMS_IN_ROW,
bool resizeToFit = true); bool resizeToFit = true);
BMenuBar(const char* title, BMenuBar(const char* name,
menu_layout layout = B_ITEMS_IN_ROW, menu_layout layout = B_ITEMS_IN_ROW,
uint32 flags = B_WILL_DRAW uint32 flags = B_WILL_DRAW
| B_FRAME_EVENTS); | B_FRAME_EVENTS);
src/kits/interface/MenuBar.cpp
+8 -8
View File
@@ -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) 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), | B_FULL_UPDATE_ON_RESIZE, layout, resizeToFit),
fBorder(B_BORDER_FRAME), fBorder(B_BORDER_FRAME),
fTrackingPID(-1), 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, flags | B_WILL_DRAW | B_FRAME_EVENTS | B_SUPPORTS_LAYOUT,
layout, false), layout, false),
fBorder(B_BORDER_FRAME), 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), fBorder(B_BORDER_FRAME),
fTrackingPID(-1), fTrackingPID(-1),
fPrevFocusToken(-1), fPrevFocusToken(-1),
@@ -88,11 +88,11 @@ BMenuBar::BMenuBar(BMessage* data)
{ {
int32 border; int32 border;
if (data->FindInt32("_border", &border) == B_OK) if (archive->FindInt32("_border", &border) == B_OK)
SetBorder((menu_bar_border)border); SetBorder((menu_bar_border)border);
menu_layout layout = B_ITEMS_IN_COLUMN; menu_layout layout = B_ITEMS_IN_COLUMN;
data->FindInt32("_layout", (int32*)&layout); archive->FindInt32("_layout", (int32*)&layout);
_InitData(layout); _InitData(layout);
} }