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

small cleanups

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22964 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2007-11-20 12:59:17 +00:00
parent c053b4a9f8
commit 15b9bc4f1b
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BMCPrivate.cpp
+15 -14
View File
@@ -14,6 +14,7 @@
#include <MenuField.h> #include <MenuField.h>
#include <MenuItem.h> #include <MenuItem.h>
#include <Message.h> #include <Message.h>
#include <MessageRunner.h>
#include <Region.h> #include <Region.h>
#include <Window.h> #include <Window.h>
@@ -57,18 +58,16 @@ _BMCFilter_::operator=(const _BMCFilter_ &)
_BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField *menuField) _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField *menuField)
: BMenuBar(frame, "_mc_mb_", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_ITEMS_IN_ROW, : BMenuBar(frame, "_mc_mb_", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_ITEMS_IN_ROW,
!fixedSize) !fixedSize),
fMenuField(menuField),
fFixedSize(fixedSize),
fRunner(NULL),
fShowPopUpMarker(true)
{ {
SetFlags(Flags() | B_FRAME_EVENTS); SetFlags(Flags() | B_FRAME_EVENTS);
SetBorder(B_BORDER_CONTENTS); SetBorder(B_BORDER_CONTENTS);
fMenuField = menuField;
fFixedSize = fixedSize;
fRunner = NULL;
fShowPopUpMarker = true;
float left, top, right, bottom; float left, top, right, bottom;
GetItemMargins(&left, &top, &right, &bottom); GetItemMargins(&left, &top, &right, &bottom);
// give a bit more space to draw the small thumb // give a bit more space to draw the small thumb
left -= 1; left -= 1;
@@ -82,21 +81,23 @@ _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField *menuField)
_BMCMenuBar_::_BMCMenuBar_(BMessage *data) _BMCMenuBar_::_BMCMenuBar_(BMessage *data)
: BMenuBar(data) : BMenuBar(data),
fMenuField(NULL),
fFixedSize(true),
fRunner(NULL),
fShowPopUpMarker(true)
{ {
SetFlags(Flags() | B_FRAME_EVENTS); SetFlags(Flags() | B_FRAME_EVENTS);
bool rsize_to_fit; bool resizeToFit;
if (data->FindBool("_rsize_to_fit", &resizeToFit) == B_OK)
if (data->FindBool("_rsize_to_fit", &rsize_to_fit) == B_OK) fFixedSize = !resizeToFit;
fFixedSize = !rsize_to_fit;
else
fFixedSize = true;
} }
_BMCMenuBar_::~_BMCMenuBar_() _BMCMenuBar_::~_BMCMenuBar_()
{ {
delete fRunner;
} }