From d8ca32c9aad8212cb9b1b28ddfa00273aef13127 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Wed, 8 Mar 2006 23:16:51 +0000 Subject: [PATCH] Implemented unarchiving constructor more or less correctly. Minor cleanup git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16668 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/MenuBar.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kits/interface/MenuBar.cpp b/src/kits/interface/MenuBar.cpp index 6661082f7c..73af461a1e 100644 --- a/src/kits/interface/MenuBar.cpp +++ b/src/kits/interface/MenuBar.cpp @@ -60,8 +60,11 @@ BMenuBar::BMenuBar(BMessage *data) if (data->FindInt32("_border", &border) == B_OK) SetBorder((menu_bar_border)border); - - // TODO: InitData() ?? + + menu_layout layout = B_ITEMS_IN_COLUMN; + data->FindInt32("_layout", (int32 *)&layout); + + InitData(layout); } @@ -81,8 +84,8 @@ BMenuBar::Instantiate(BMessage *data) { if (validate_instantiation(data, "BMenuBar")) return new BMenuBar(data); - else - return NULL; + + return NULL; } @@ -224,9 +227,7 @@ BMenuBar::Hide() BHandler * -BMenuBar::ResolveSpecifier(BMessage *msg, int32 index, - BMessage *specifier, int32 form, - const char *property) +BMenuBar::ResolveSpecifier(BMessage *msg, int32 index, BMessage *specifier, int32 form, const char *property) { return BMenu::ResolveSpecifier(msg, index, specifier, form, property); } @@ -295,8 +296,7 @@ BMenuBar::operator=(const BMenuBar &) void -BMenuBar::StartMenuBar(int32 menuIndex, bool sticky, bool showMenu, - BRect *specialRect) +BMenuBar::StartMenuBar(int32 menuIndex, bool sticky, bool showMenu, BRect *specialRect) { BWindow *window = Window(); if (window == NULL)