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

* Updated indentation style

Browse Source 
* Fixed copyright

+alphabranch


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32711 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-08-26 13:44:50 +00:00
parent 42a5968afd
commit a449ca33dc
1 changed files with 103 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/MenuField.h
+18 -15
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2006-2009, Haiku, Inc. All Rights Reserved. * Copyright 2006-2009, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT license.
*/ */
#ifndef _MENU_FIELD_H #ifndef _MENU_FIELD_H
#define _MENU_FIELD_H #define _MENU_FIELD_H
@@ -35,7 +35,8 @@ public:
virtual ~BMenuField(); virtual ~BMenuField();
static BArchivable* Instantiate(BMessage* archive); static BArchivable* Instantiate(BMessage* archive);
virtual status_t Archive(BMessage* archive, bool deep = true) const; virtual status_t Archive(BMessage* archive,
bool deep = true) const;
virtual void Draw(BRect update); virtual void Draw(BRect update);
virtual void AttachedToWindow(); virtual void AttachedToWindow();
@@ -45,13 +46,13 @@ public:
virtual void MakeFocus(bool state); virtual void MakeFocus(bool state);
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
virtual void WindowActivated(bool state); virtual void WindowActivated(bool state);
virtual void MouseUp(BPoint pt); virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint pt, uint32 code, virtual void MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage); const BMessage* dragMessage);
virtual void DetachedFromWindow(); virtual void DetachedFromWindow();
virtual void AllDetached(); virtual void AllDetached();
virtual void FrameMoved(BPoint new_position); virtual void FrameMoved(BPoint where);
virtual void FrameResized(float new_width, float new_height); virtual void FrameResized(float width, float height);
BMenu* Menu() const; BMenu* Menu() const;
BMenuBar* MenuBar() const; BMenuBar* MenuBar() const;
@@ -88,13 +89,20 @@ public:
BLayoutItem* CreateLabelLayoutItem(); BLayoutItem* CreateLabelLayoutItem();
BLayoutItem* CreateMenuBarLayoutItem(); BLayoutItem* CreateMenuBarLayoutItem();
/*----- Private or reserved -----------------------------------------*/
virtual status_t Perform(perform_code d, void* arg); virtual status_t Perform(perform_code d, void* arg);
protected: protected:
virtual void DoLayout(); virtual void DoLayout();
private:
// FBC padding
virtual void _ReservedMenuField1();
virtual void _ReservedMenuField2();
virtual void _ReservedMenuField3();
// Forbidden
BMenuField& operator=(const BMenuField& other);
private: private:
class LabelLayoutItem; class LabelLayoutItem;
class MenuBarLayoutItem; class MenuBarLayoutItem;
@@ -105,12 +113,6 @@ private:
friend class MenuBarLayoutItem; friend class MenuBarLayoutItem;
friend class LayoutData; friend class LayoutData;
virtual void _ReservedMenuField1();
virtual void _ReservedMenuField2();
virtual void _ReservedMenuField3();
BMenuField& operator=(const BMenuField& other);
void InitObject(const char* label); void InitObject(const char* label);
void InitObject2(); void InitObject2();
void DrawLabel(BRect bounds, BRect update); void DrawLabel(BRect bounds, BRect update);
@@ -127,6 +129,7 @@ private:
float _MenuBarOffset() const; float _MenuBarOffset() const;
float _MenuBarWidth() const; float _MenuBarWidth() const;
private:
char* fLabel; char* fLabel;
BMenu* fMenu; BMenu* fMenu;
BMenuBar* fMenuBar; BMenuBar* fMenuBar;