diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-10 08:57:06 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-11 14:46:45 +0100 |
commit | ef877aab7ee88f03b36447af82904fc94938f569 (patch) | |
tree | 907ad0a6990d94e7fe481e1b317666efd8113f62 /vcl/source | |
parent | b19b94b7d13851502a1a8069c1d12101350f7d4a (diff) |
FixedBorder is no longer used
Change-Id: Ic4b1ab81d414963e7cb40c348737504c8021a7fb
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/control/fixbrd.cxx | 196 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 1 |
2 files changed, 0 insertions, 197 deletions
diff --git a/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx deleted file mode 100644 index fdf31f46467b..000000000000 --- a/vcl/source/control/fixbrd.cxx +++ /dev/null @@ -1,196 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <tools/rc.h> -#include <vcl/event.hxx> -#include <vcl/fixbrd.hxx> - -void FixedBorder::ImplInit( Window* pParent, WinBits nStyle ) -{ - nStyle = ImplInitStyle( nStyle ); - Control::ImplInit( pParent, nStyle, NULL ); - ImplInitSettings(); -} - -// ----------------------------------------------------------------------- - -WinBits FixedBorder::ImplInitStyle( WinBits nStyle ) -{ - if ( !(nStyle & WB_NOGROUP) ) - nStyle |= WB_GROUP; - return nStyle; -} - -// ----------------------------------------------------------------------- - -void FixedBorder::ImplInitSettings() -{ - Window* pParent = GetParent(); - if ( (pParent->IsChildTransparentModeEnabled() || - !(pParent->GetStyle() & WB_CLIPCHILDREN) ) && - !IsControlBackground() ) - { - SetMouseTransparent( sal_True ); - EnableChildTransparentMode( sal_True ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); - SetBackground(); - } - else - { - SetMouseTransparent( sal_False ); - EnableChildTransparentMode( sal_False ); - SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); - - if ( IsControlBackground() ) - SetBackground( GetControlBackground() ); - else - SetBackground( pParent->GetBackground() ); - } -} - -// ----------------------------------------------------------------------- - -FixedBorder::FixedBorder( Window* pParent, const ResId& rResId ) : - Control( WINDOW_FIXEDBORDER ) -{ - rResId.SetRT( RSC_CONTROL ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - -FixedBorder::~FixedBorder() -{ -} - -// ----------------------------------------------------------------------- - -void FixedBorder::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, - const Point& rPos, const Size& rSize ) -{ - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - Rectangle aRect( rPos, rSize ); - sal_uInt16 nBorderStyle = FIXEDBORDER_TYPE_DOUBLEOUT; - - if ( (nDrawFlags & WINDOW_DRAW_MONO) || - (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) ) - nBorderStyle |= FRAME_DRAW_MONO; - - /* - // seems only to be used in tools->options around a tabpage (ie, no tabcontrol!) - // as tabpages that are not embedded in a tabcontrol should not be drawn natively - // the fixedborder must also not be drawn (reason was, that it looks too ugly, dialogs must be redesigned) - Window *pWin = pDev->GetOutDevType() == OUTDEV_WINDOW ? (Window*) pDev : NULL; - if( !(nBorderStyle & FRAME_DRAW_MONO) && pWin && pWin->IsNativeControlSupported( CTRL_FIXEDBORDER, PART_ENTIRE_CONTROL ) ) - { - ImplControlValue aControlValue; - Point aPt; - Region aCtrlRegion( Rectangle( aPt, GetOutputSizePixel() ) ); - ControlState nState = IsEnabled() ? CTRL_STATE_ENABLED : 0; - pWin->DrawNativeControl( CTRL_FIXEDBORDER, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); - } - else - */ - { - DecorationView aDecoView( pDev ); - aDecoView.DrawFrame( aRect, nBorderStyle ); - } -} - -// ----------------------------------------------------------------------- - -void FixedBorder::Paint( const Rectangle& ) -{ - ImplDraw( this, 0, Point(), GetOutputSizePixel() ); -} - -// ----------------------------------------------------------------------- - -void FixedBorder::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uLong nFlags ) -{ - Point aPos = pDev->LogicToPixel( rPos ); - Size aSize = pDev->LogicToPixel( rSize ); - - pDev->Push(); - pDev->SetMapMode(); - ImplDraw( pDev, nFlags, aPos, aSize ); - pDev->Pop(); -} - -// ----------------------------------------------------------------------- - -void FixedBorder::Resize() -{ - Invalidate(); -} - -// ----------------------------------------------------------------------- - -void FixedBorder::StateChanged( StateChangedType nType ) -{ - Control::StateChanged( nType ); - - if ( (nType == STATE_CHANGE_DATA) || - (nType == STATE_CHANGE_UPDATEMODE) ) - { - if ( IsUpdateMode() ) - Invalidate(); - } - else if ( nType == STATE_CHANGE_STYLE ) - SetStyle( ImplInitStyle( GetStyle() ) ); - else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - { - ImplInitSettings(); - Invalidate(); - } -} - -// ----------------------------------------------------------------------- - -void FixedBorder::DataChanged( const DataChangedEvent& rDCEvt ) -{ - Control::DataChanged( rDCEvt ); - - if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - { - ImplInitSettings(); - Invalidate(); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e55a0928d5a5..d9aff3d04556 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8749,7 +8749,6 @@ sal_uInt16 Window::GetAccessibleRole() const case WINDOW_TREELISTBOX: nRole = accessibility::AccessibleRole::TREE; break; case WINDOW_FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; break; - case WINDOW_FIXEDBORDER: case WINDOW_FIXEDLINE: nRole = accessibility::AccessibleRole::SEPARATOR; break; case WINDOW_FIXEDBITMAP: case WINDOW_FIXEDIMAGE: nRole = accessibility::AccessibleRole::ICON; break; |