Sorry, this fixes the build. I accidentally commited headers/os/interface
instead. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29701 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2001-2006, Haiku, Inc.
|
* Copyright 2001-2009 Haiku, Inc. All rights reserved.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -20,44 +20,52 @@ class BMessageRunner;
|
|||||||
|
|
||||||
class _BMCFilter_ : public BMessageFilter {
|
class _BMCFilter_ : public BMessageFilter {
|
||||||
public:
|
public:
|
||||||
_BMCFilter_(BMenuField *menuField, uint32 what);
|
_BMCFilter_(BMenuField* menuField, uint32 what);
|
||||||
virtual ~_BMCFilter_();
|
virtual ~_BMCFilter_();
|
||||||
filter_result Filter(BMessage *message, BHandler **handler);
|
|
||||||
|
virtual filter_result Filter(BMessage* message, BHandler** handler);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
_BMCFilter_ &operator=(const _BMCFilter_ &);
|
_BMCFilter_& operator=(const _BMCFilter_&);
|
||||||
BMenuField *fMenuField;
|
|
||||||
|
BMenuField* fMenuField;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class _BMCMenuBar_ : public BMenuBar {
|
class _BMCMenuBar_ : public BMenuBar {
|
||||||
public:
|
public:
|
||||||
_BMCMenuBar_(BRect frame, bool fixed_size,
|
_BMCMenuBar_(BRect frame, bool fixedSize,
|
||||||
BMenuField *menuField);
|
BMenuField* menuField);
|
||||||
_BMCMenuBar_(BMessage *data);
|
_BMCMenuBar_(bool fixedSize,
|
||||||
virtual ~_BMCMenuBar_();
|
BMenuField* menuField);
|
||||||
|
_BMCMenuBar_(BMessage* data);
|
||||||
|
virtual ~_BMCMenuBar_();
|
||||||
|
|
||||||
static BArchivable *Instantiate(BMessage *data);
|
static BArchivable* Instantiate(BMessage* data);
|
||||||
|
|
||||||
virtual void AttachedToWindow();
|
virtual void AttachedToWindow();
|
||||||
virtual void Draw(BRect updateRect);
|
virtual void Draw(BRect updateRect);
|
||||||
virtual void FrameResized(float width, float height);
|
virtual void FrameResized(float width, float height);
|
||||||
virtual void MessageReceived(BMessage* msg);
|
virtual void MessageReceived(BMessage* msg);
|
||||||
virtual void MakeFocus(bool focused = true);
|
virtual void MakeFocus(bool focused = true);
|
||||||
|
|
||||||
void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; }
|
void TogglePopUpMarker(bool show)
|
||||||
bool IsPopUpMarkerShown() const { return fShowPopUpMarker; }
|
{ fShowPopUpMarker = show; }
|
||||||
|
bool IsPopUpMarkerShown() const
|
||||||
|
{ return fShowPopUpMarker; }
|
||||||
|
|
||||||
virtual BSize MaxSize();
|
virtual BSize MaxSize();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
_BMCMenuBar_&operator=(const _BMCMenuBar_ &);
|
_BMCMenuBar_&operator=(const _BMCMenuBar_&);
|
||||||
|
|
||||||
BMenuField *fMenuField;
|
void _Init(bool setMaxContentWidth);
|
||||||
bool fFixedSize;
|
|
||||||
BMessageRunner *fRunner;
|
BMenuField* fMenuField;
|
||||||
bool fShowPopUpMarker;
|
bool fFixedSize;
|
||||||
float fPreviousWidth;
|
BMessageRunner* fRunner;
|
||||||
|
bool fShowPopUpMarker;
|
||||||
|
float fPreviousWidth;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _BMC_PRIVATE_H
|
#endif // _BMC_PRIVATE_H
|
||||||
|
|||||||
Reference in New Issue
Block a user