* Made the messed up BMessage* constructors private - since it only affects the
layout API, we probably can just phase it out after a while. * Introduced new constructors, and added missing flags to one of them to make it more convenient to use. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41350 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2006-2009, Haiku, Inc. All rights reserved.
|
||||
* Copyright 2006-2011, Haiku, Inc. All rights reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _MENU_FIELD_H
|
||||
@@ -25,10 +25,9 @@ public:
|
||||
uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
|
||||
BMenuField(const char* name,
|
||||
const char* label, BMenu* menu,
|
||||
BMessage* message = NULL,
|
||||
uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
|
||||
BMenuField(const char* label,
|
||||
BMenu* menu, BMessage* message = NULL);
|
||||
BMenuField(const char* label, BMenu* menu,
|
||||
uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
|
||||
BMenuField(BMessage* data);
|
||||
virtual ~BMenuField();
|
||||
|
||||
@@ -113,6 +112,13 @@ private:
|
||||
friend class MenuBarLayoutItem;
|
||||
friend class LayoutData;
|
||||
|
||||
BMenuField(const char* name,
|
||||
const char* label, BMenu* menu,
|
||||
BMessage* message,
|
||||
uint32 flags);
|
||||
BMenuField(const char* label,
|
||||
BMenu* menu, BMessage* message);
|
||||
|
||||
void InitObject(const char* label);
|
||||
void InitObject2();
|
||||
void DrawLabel(BRect bounds, BRect update);
|
||||
|
||||
Reference in New Issue
Block a user