mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FixedBorder is no longer used

Browse Source 
Change-Id: Ic4b1ab81d414963e7cb40c348737504c8021a7fb
This commit is contained in:
Caolán McNamara
2012-06-10 08:57:06 +01:00
parent b19b94b7d1
commit ef877aab7e
6 changed files with 8 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/inc/tools/wintypes.hxx
View File

@@ -110,15 +110,14 @@ typedef sal_uInt16 WindowType;
#define WINDOW_BORDERWINDOW (WINDOW_FIRST + 0x47)
#define WINDOW_BUTTONDIALOG (WINDOW_FIRST + 0x48)
#define WINDOW_SYSTEMCHILDWINDOW (WINDOW_FIRST + 0x49)
#define WINDOW_FIXEDBORDER (WINDOW_FIRST + 0x4a)
#define WINDOW_SLIDER (WINDOW_FIRST + 0x4b)
#define WINDOW_MENUBARWINDOW (WINDOW_FIRST + 0x4c)
#define WINDOW_TREELISTBOX (WINDOW_FIRST + 0x4d)
#define WINDOW_HELPTEXTWINDOW (WINDOW_FIRST + 0x4e)
#define WINDOW_INTROWINDOW (WINDOW_FIRST + 0x4f)
#define WINDOW_LISTBOXWINDOW (WINDOW_FIRST + 0x50)
#define WINDOW_DOCKINGAREA (WINDOW_FIRST + 0x51)
#define WINDOW_RULER (WINDOW_FIRST + 0x52)
#define WINDOW_SLIDER (WINDOW_FIRST + 0x4a)
#define WINDOW_MENUBARWINDOW (WINDOW_FIRST + 0x4b)
#define WINDOW_TREELISTBOX (WINDOW_FIRST + 0x4c)
#define WINDOW_HELPTEXTWINDOW (WINDOW_FIRST + 0x4d)
#define WINDOW_INTROWINDOW (WINDOW_FIRST + 0x4e)
#define WINDOW_LISTBOXWINDOW (WINDOW_FIRST + 0x4f)
#define WINDOW_DOCKINGAREA (WINDOW_FIRST + 0x50)
#define WINDOW_RULER (WINDOW_FIRST + 0x51)
#define WINDOW_LAST (WINDOW_RULER)

1
vcl/Library_vcl.mk
View File

@@ -132,7 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/control/edit \
vcl/source/control/field2 \
vcl/source/control/field \
vcl/source/control/fixbrd \
vcl/source/control/fixed \
vcl/source/control/group \
vcl/source/control/ilstbox \

1
vcl/Package_inc.mk
View File

@@ -60,7 +60,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/event.hxx,vcl/event.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/evntpost.hxx,vcl/evntpost.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/extoutdevdata.hxx,vcl/extoutdevdata.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/field.hxx,vcl/field.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixbrd.hxx,vcl/fixbrd.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx))

75
vcl/inc/vcl/fixbrd.hxx
View File

@@ -1,75 +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.
*
************************************************************************/
#ifndef _SV_FIXBRD_HXX
#define _SV_FIXBRD_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/decoview.hxx>
#include <vcl/ctrl.hxx>
// ---------------------
// - FixedBorder-Types -
// ---------------------
#define FIXEDBORDER_TYPE_IN (FRAME_DRAW_IN)
#define FIXEDBORDER_TYPE_OUT (FRAME_DRAW_OUT)
#define FIXEDBORDER_TYPE_GROUP (FRAME_DRAW_GROUP)
#define FIXEDBORDER_TYPE_DOUBLEIN (FRAME_DRAW_DOUBLEIN)
#define FIXEDBORDER_TYPE_DOUBLEOUT (FRAME_DRAW_DOUBLEOUT)
// ---------------
// - FixedBorder -
// ---------------
class VCL_DLLPUBLIC FixedBorder : public Control
{
private:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings();
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
const Point& rPos, const Size& rSize );
public:
FixedBorder( Window* pParent, const ResId& rResId );
~FixedBorder();
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Resize();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
#endif // _SV_FIXBRD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

196
vcl/source/control/fixbrd.cxx
View File

@@ -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: */

1
vcl/source/window/window.cxx
View File

@@ -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;