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

Style fixes to BBox, update copyright header

Browse Source
This commit is contained in:
John Scipione
2013-05-30 20:35:42 -04:00
parent 19d9ad49ae
commit f9954bfc69
2 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Box.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2005-2006, Haiku, Inc. All Rights Reserved. * Copyright 2005-2013 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _BOX_H #ifndef _BOX_H
src/kits/interface/Box.cpp
+15 -11
View File
@@ -1,12 +1,13 @@
/* /*
* Copyright (c) 2001-2009, Haiku, Inc. * Copyright 2001-2013 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
* Authors: * Authors:
* Marc Flerackers ([email protected]) * Stephan Aßmus, [email protected]
* Stephan Aßmus <[email protected]> * DarkWyrm, [email protected]
* DarkWyrm <[email protected]>
* Axel Dörfler, [email protected] * Axel Dörfler, [email protected]
* Marc Flerackers, [email protected]
* John Scipione, [email protected]
*/ */
@@ -43,7 +44,8 @@ struct BBox::LayoutData {
BBox::BBox(BRect frame, const char* name, uint32 resizingMode, uint32 flags, BBox::BBox(BRect frame, const char* name, uint32 resizingMode, uint32 flags,
border_style border) border_style border)
: BView(frame, name, resizingMode, flags | B_WILL_DRAW | B_FRAME_EVENTS), :
BView(frame, name, resizingMode, flags | B_WILL_DRAW | B_FRAME_EVENTS),
fStyle(border) fStyle(border)
{ {
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -54,7 +56,8 @@ BBox::BBox(BRect frame, const char *name, uint32 resizingMode, uint32 flags,
BBox::BBox(const char* name, uint32 flags, border_style border, BView* child) BBox::BBox(const char* name, uint32 flags, border_style border, BView* child)
: BView(name, flags | B_WILL_DRAW | B_FRAME_EVENTS), :
BView(name, flags | B_WILL_DRAW | B_FRAME_EVENTS),
fStyle(border) fStyle(border)
{ {
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -68,7 +71,8 @@ BBox::BBox(const char* name, uint32 flags, border_style border, BView* child)
BBox::BBox(border_style border, BView* child) BBox::BBox(border_style border, BView* child)
: BView(NULL, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP), :
BView(NULL, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP),
fStyle(border) fStyle(border)
{ {
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -82,7 +86,8 @@ BBox::BBox(border_style border, BView* child)
BBox::BBox(BMessage* archive) BBox::BBox(BMessage* archive)
: BView(archive), :
BView(archive),
fStyle(B_FANCY_BORDER) fStyle(B_FANCY_BORDER)
{ {
_InitObject(archive); _InitObject(archive);
@@ -399,9 +404,8 @@ BBox::FrameMoved(BPoint newLocation)
BHandler* BHandler*
BBox::ResolveSpecifier(BMessage *message, int32 index, BBox::ResolveSpecifier(BMessage* message, int32 index, BMessage* specifier,
BMessage *specifier, int32 what, int32 what, const char* property)
const char *property)
{ {
return BView::ResolveSpecifier(message, index, specifier, what, property); return BView::ResolveSpecifier(message, index, specifier, what, property);
} }