From fa55277509699696841ce7546048c9f3b5bb2317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 19 Jul 2008 12:36:26 +0000 Subject: [PATCH] In BeOS, BView::Bounds() does the owner lock check. In Haiku, it does now too. Removed the check in Frame() accordingly, because that uses Bounds(). Removed some code left overs. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26501 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/View.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index 1d87fbbd01..762c01d148 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -621,24 +621,8 @@ BView::~BView() BRect BView::Bounds() const { - // do we need to update our bounds? + _CheckLock(); -// TODO: why should our frame be out of sync ever? -/* - if (!fState->IsValid(B_VIEW_FRAME_BIT) && fOwner) { - _CheckLockAndSwitchCurrent(); - - fOwner->fLink->StartMessage(AS_VIEW_GET_COORD); - - int32 code; - if (fOwner->fLink->FlushWithReply(code) == B_OK - && code == B_OK) { - fOwner->fLink->Read(const_cast(&fParentOffset)); - fOwner->fLink->Read(const_cast(&fBounds)); - fState->valid_flags |= B_VIEW_FRAME_BIT; - } - } -*/ if (fIsPrinting) return fState->print_rect; @@ -906,8 +890,6 @@ BView::SetFlags(uint32 flags) BRect BView::Frame() const { - _CheckLock(); - return Bounds().OffsetToCopy(fParentOffset.x, fParentOffset.y); }