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

convert PARENTCLIPMODE constants to scoped enum

Browse Source 
Change-Id: I36a53112e75fca9208b2f91e224a7c671695509b
This commit is contained in:
Noel Grandin 2015-05-27 16:09:43 +02:00
parent 173aa749d5
commit f3331f7694
27 changed files with 73 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avmedia/source/framework/mediacontrol.cxx
View File

@ -79,7 +79,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
SetBackground();
SetPaintTransparent( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{

2
canvas/source/directx/dx_9rm.cxx
View File

@ -673,7 +673,7 @@ namespace dxcanvas
mpWindow->SetMouseTransparent( TRUE );
// parent should receive paint messages as well
// [PARENTCLIPMODE_NOCLIP], the argument is here
// [ParentClipMode::NoClip], the argument is here
// passed as plain numeric value since the stupid
// define utilizes a USHORT cast.
mpWindow->SetParentClipMode(0x0002);

4
cui/source/dialogs/iconcdlg.cxx
View File

@ -98,14 +98,14 @@ void IconChoicePage::ImplInitSettings()
if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
}
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )

16
include/vcl/window.hxx
View File

@ -269,8 +269,16 @@ namespace o3tl
}
// Flags for ParentClipMode
#define PARENTCLIPMODE_CLIP ((sal_uInt16)0x0001)
#define PARENTCLIPMODE_NOCLIP ((sal_uInt16)0x0002)
enum class ParentClipMode
{
NONE = 0x0000,
Clip = 0x0001,
NoClip = 0x0002,
};
namespace o3tl
{
template<> struct typed_flags<ParentClipMode> : is_typed_flags<ParentClipMode, 0x0003> {};
}
// Flags for Invert()
enum class InvertFlags
@ -1001,8 +1009,8 @@ public:
bool IsControlBackground() const;
void ApplyControlBackground(vcl::RenderContext& rRenderContext, const Color& rDefaultColor);
void SetParentClipMode( sal_uInt16 nMode = 0 );
sal_uInt16 GetParentClipMode() const;
void SetParentClipMode( ParentClipMode nMode = ParentClipMode::NONE );
ParentClipMode GetParentClipMode() const;
void SetWindowRegionPixel();
void SetWindowRegionPixel( const vcl::Region& rRegion );

2
reportdesign/source/ui/report/EndMarker.cxx
View File

@ -80,7 +80,7 @@ void OEndMarker::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rR
void OEndMarker::ImplInitSettings()
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground( Wallpaper( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor) );

2
reportdesign/source/ui/report/ReportSection.cxx
View File

@ -92,7 +92,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
//EnableChildTransparentMode();
SetHelpId(HID_REPORTSECTION);
SetMapMode(MapMode(MAP_100TH_MM));
SetParentClipMode(PARENTCLIPMODE_CLIP);
SetParentClipMode(ParentClipMode::Clip);
EnableChildTransparentMode( false );
SetPaintTransparent( false );

2
reportdesign/source/ui/report/SectionWindow.cxx
View File

@ -208,7 +208,7 @@ void OSectionWindow::ImplInitSettings()
if ( t )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
}
SetBackground( );

2
reportdesign/source/ui/report/StartMarker.cxx
View File

@ -74,7 +74,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry
const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
m_aVRuler->SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH);
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
}

4
sd/source/ui/presenter/PresenterHelper.cxx
View File

@ -101,12 +101,12 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
pWindow->SetBackground();
if ( ! bEnableParentClip)
{
pWindow->SetParentClipMode(PARENTCLIPMODE_NOCLIP);
pWindow->SetParentClipMode(ParentClipMode::NoClip);
pWindow->SetPaintTransparent(true);
}
else
{
pWindow->SetParentClipMode(PARENTCLIPMODE_CLIP);
pWindow->SetParentClipMode(ParentClipMode::Clip);
pWindow->SetPaintTransparent(false);
}

2
slideshow/source/engine/shapes/viewmediashape.cxx
View File

@ -489,7 +489,7 @@ namespace slideshow
Size( aAWTRect.Width, aAWTRect.Height ) );
}
mpMediaWindow->SetBackground( Color( COL_BLACK ) );
mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
mpMediaWindow->SetParentClipMode( ParentClipMode::NoClip );
mpMediaWindow->EnableEraseBackground( false );
mpMediaWindow->EnablePaint( false );
mpMediaWindow->SetForwardKey( true );

3
vcl/inc/window.h
View File

@ -61,6 +61,7 @@ enum class MouseNotifyEvent;
enum class ActivateModeFlags;
enum class DialogControlFlags;
enum class GetFocusFlags;
enum class ParentClipMode;
namespace com { namespace sun { namespace star {
@ -276,7 +277,7 @@ public:
sal_uInt16 mnWaitCount;
sal_uInt16 mnPaintFlags;
GetFocusFlags mnGetFocusFlags;
sal_uInt16 mnParentClipMode;
ParentClipMode mnParentClipMode;
ActivateModeFlags mnActivateMode;
DialogControlFlags mnDlgCtrlFlags;
sal_uInt16 mnLockCount;

2
vcl/source/app/help.cxx
View File

@ -279,7 +279,7 @@ void HelpTextWindow::ApplySettings(vcl::RenderContext& rRenderContext)
if (rRenderContext.IsNativeControlSupported(CTRL_TOOLTIP, PART_ENTIRE_CONTROL))
{
EnableChildTransparentMode(true);
SetParentClipMode(PARENTCLIPMODE_NOCLIP);
SetParentClipMode(ParentClipMode::NoClip);
SetPaintTransparent(true);
rRenderContext.SetBackground();
}

14
vcl/source/control/button.cxx
View File

@ -691,13 +691,13 @@ void PushButton::ImplInitSettings( bool bFont,
{
SetBackground();
// #i38498#: do not check for GetParent()->IsChildTransparentModeEnabled()
// otherwise the formcontrol button will be overdrawn due to PARENTCLIPMODE_NOCLIP
// otherwise the formcontrol button will be overdrawn due to ParentClipMode::NoClip
// for radio and checkbox this is ok as they should appear transparent in documents
if ( IsNativeControlSupported( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL ) ||
(GetStyle() & WB_FLATBUTTON) != 0 )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
mpWindowImpl->mbUseNativeFocus = (GetStyle() & WB_FLATBUTTON) == 0
&& ImplGetSVData()->maNWFData.mbNoFocusRects;
@ -705,7 +705,7 @@ void PushButton::ImplInitSettings( bool bFont,
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
}
}
@ -1855,7 +1855,7 @@ void RadioButton::ImplInitSettings( bool bFont,
(pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
if( IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) )
@ -1864,7 +1864,7 @@ void RadioButton::ImplInitSettings( bool bFont,
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )
@ -2993,7 +2993,7 @@ void CheckBox::ImplInitSettings( bool bFont,
(pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
if( IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) )
@ -3002,7 +3002,7 @@ void CheckBox::ImplInitSettings( bool bFont,
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )

16
vcl/source/control/fixed.cxx
View File

@ -211,14 +211,14 @@ void FixedText::ApplySettings(vcl::RenderContext& rRenderContext)
if (pParent->IsChildTransparentModeEnabled() && !IsControlBackground())
{
EnableChildTransparentMode(true);
SetParentClipMode(PARENTCLIPMODE_NOCLIP);
SetParentClipMode(ParentClipMode::NoClip);
SetPaintTransparent(true);
rRenderContext.SetBackground();
}
else
{
EnableChildTransparentMode(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
SetPaintTransparent(false);
if (IsControlBackground())
@ -619,14 +619,14 @@ void FixedLine::ApplySettings(vcl::RenderContext& rRenderContext)
if (pParent->IsChildTransparentModeEnabled() && !IsControlBackground())
{
EnableChildTransparentMode(true);
SetParentClipMode(PARENTCLIPMODE_NOCLIP);
SetParentClipMode(ParentClipMode::NoClip);
SetPaintTransparent(true);
rRenderContext.SetBackground();
}
else
{
EnableChildTransparentMode(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
SetPaintTransparent(false);
if (IsControlBackground())
@ -751,14 +751,14 @@ void FixedBitmap::ApplySettings(vcl::RenderContext& rRenderContext)
if (pParent->IsChildTransparentModeEnabled() && !IsControlBackground())
{
EnableChildTransparentMode(true);
SetParentClipMode(PARENTCLIPMODE_NOCLIP);
SetParentClipMode(ParentClipMode::NoClip);
SetPaintTransparent(true);
rRenderContext.SetBackground();
}
else
{
EnableChildTransparentMode(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
SetPaintTransparent(false);
if (IsControlBackground())
@ -921,14 +921,14 @@ void FixedImage::ApplySettings(vcl::RenderContext& rRenderContext)
if (pParent && pParent->IsChildTransparentModeEnabled() && !IsControlBackground())
{
EnableChildTransparentMode(true);
SetParentClipMode(PARENTCLIPMODE_NOCLIP);
SetParentClipMode(ParentClipMode::NoClip);
SetPaintTransparent(true);
rRenderContext.SetBackground();
}
else
{
EnableChildTransparentMode(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
SetPaintTransparent(false);
if (IsControlBackground())

4
vcl/source/control/group.cxx
View File

@ -68,14 +68,14 @@ void GroupBox::ImplInitSettings( bool bFont,
!IsControlBackground() )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
}
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )

2
vcl/source/control/prgsbar.cxx
View File

@ -83,7 +83,7 @@ void ProgressBar::ImplInitSettings( bool bFont,
EnableChildTransparentMode( true );
SetPaintTransparent( true );
SetBackground();
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
}
else
{

4
vcl/source/control/slider.cxx
View File

@ -99,14 +99,14 @@ void Slider::ImplInitSettings()
if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
}
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )

4
vcl/source/control/tabctrl.cxx
View File

@ -145,7 +145,7 @@ void TabControl::ImplInitSettings( bool bFont,
// set transparent mode for NWF tabcontrols to have
// the background always cleared properly
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
ImplGetWindowImpl()->mbUseNativeFocus = ImplGetSVData()->maNWFData.mbNoFocusRects;
@ -153,7 +153,7 @@ void TabControl::ImplInitSettings( bool bFont,
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )

6
vcl/source/opengl/OpenGLContext.cxx
View File

@ -1088,7 +1088,7 @@ bool OpenGLContext::initWindow()
if( m_pChildWindow )
{
m_pChildWindow->SetMouseTransparent( true );
m_pChildWindow->SetParentClipMode(PARENTCLIPMODE_CLIP);
m_pChildWindow->SetParentClipMode(ParentClipMode::Clip);
m_pChildWindow->EnableEraseBackground( false );
m_pChildWindow->SetControlForeground();
m_pChildWindow->SetControlBackground();
@ -1115,7 +1115,7 @@ bool OpenGLContext::initWindow()
if( m_pChildWindow )
{
m_pChildWindow->SetMouseTransparent( true );
m_pChildWindow->SetParentClipMode(PARENTCLIPMODE_CLIP);
m_pChildWindow->SetParentClipMode(ParentClipMode::Clip);
m_pChildWindow->EnableEraseBackground( false );
m_pChildWindow->SetControlForeground();
m_pChildWindow->SetControlBackground();
@ -1152,7 +1152,7 @@ bool OpenGLContext::initWindow()
return false;
m_pChildWindow->SetMouseTransparent( true );
m_pChildWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
m_pChildWindow->SetParentClipMode( ParentClipMode::NoClip );
m_pChildWindow->EnableEraseBackground( false );
m_pChildWindow->SetControlForeground();
m_pChildWindow->SetControlBackground();

16
vcl/source/window/clipping.cxx
View File

@ -63,9 +63,8 @@ void Window::InitClipRegion()
mbInitClipRegion = false;
}
void Window::SetParentClipMode( sal_uInt16 nMode )
void Window::SetParentClipMode( ParentClipMode nMode )
{
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->SetParentClipMode( nMode );
else
@ -73,15 +72,14 @@ void Window::SetParentClipMode( sal_uInt16 nMode )
if ( !ImplIsOverlapWindow() )
{
mpWindowImpl->mnParentClipMode = nMode;
if ( nMode & PARENTCLIPMODE_CLIP )
if ( nMode & ParentClipMode::Clip )
mpWindowImpl->mpParent->mpWindowImpl->mbClipChildren = true;
}
}
}
sal_uInt16 Window::GetParentClipMode() const
ParentClipMode Window::GetParentClipMode() const
{
if ( mpWindowImpl->mpBorderWindow )
return mpWindowImpl->mpBorderWindow->GetParentClipMode();
else
@ -207,9 +205,9 @@ bool Window::ImplClipChildren( vcl::Region& rRegion )
if ( pWindow->mpWindowImpl->mbReallyVisible )
{
// read-out ParentClipMode-Flags
sal_uInt16 nClipMode = pWindow->GetParentClipMode();
if ( !(nClipMode & PARENTCLIPMODE_NOCLIP) &&
((nClipMode & PARENTCLIPMODE_CLIP) || (GetStyle() & WB_CLIPCHILDREN)) )
ParentClipMode nClipMode = pWindow->GetParentClipMode();
if ( !(nClipMode & ParentClipMode::NoClip) &&
((nClipMode & ParentClipMode::Clip) || (GetStyle() & WB_CLIPCHILDREN)) )
pWindow->ImplExcludeWindowRegion( rRegion );
else
bOtherClip = true;
@ -488,7 +486,7 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller )
vcl::Window* pParent = ImplGetParent();
if ( pParent &&
((pParent->GetStyle() & WB_CLIPCHILDREN) || (mpWindowImpl->mnParentClipMode & PARENTCLIPMODE_CLIP)) )
((pParent->GetStyle() & WB_CLIPCHILDREN) || (mpWindowImpl->mnParentClipMode & ParentClipMode::Clip)) )
{
pParent->mbInitClipRegion = true;
pParent->mpWindowImpl->mbInitChildRegion = true;

6
vcl/source/window/menubarwindow.cxx
View File

@ -144,7 +144,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :
aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT);
aCloseBtn->SetBackground();
aCloseBtn->SetPaintTransparent(true);
aCloseBtn->SetParentClipMode(PARENTCLIPMODE_NOCLIP);
aCloseBtn->SetParentClipMode(ParentClipMode::NoClip);
aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage, ToolBoxItemBits::NONE);
aCloseBtn->SetSelectHdl(LINK(this, MenuBarWindow, CloseHdl));
@ -1036,7 +1036,7 @@ void MenuBarWindow::ApplySettings(vcl::RenderContext& rRenderContext)
rRenderContext.SetBackground(aWallpaper);
SetPaintTransparent(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
}
else if (rRenderContext.IsNativeControlSupported(CTRL_MENUBAR, PART_ENTIRE_CONTROL))
{
@ -1048,7 +1048,7 @@ void MenuBarWindow::ApplySettings(vcl::RenderContext& rRenderContext)
aWallpaper.SetStyle(WALLPAPER_APPLICATIONGRADIENT);
rRenderContext.SetBackground(aWallpaper);
SetPaintTransparent(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
}
rRenderContext.SetTextColor(rStyleSettings.GetMenuBarTextColor());

2
vcl/source/window/paint.cxx
View File

@ -1359,7 +1359,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
// do the actual paint
// background
if( ! IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & PARENTCLIPMODE_NOCLIP ) )
if( ! IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & ParentClipMode::NoClip ) )
Erase(*this);
// foreground
Paint(*this, aPaintRect);

2
vcl/source/window/stacking.cxx
View File

@ -941,7 +941,7 @@ void Window::SetParent( vcl::Window* pNewParent )
}
ImplRemoveWindow( bNewFrame );
ImplInsertWindow( pNewParent );
if ( mpWindowImpl->mnParentClipMode & PARENTCLIPMODE_CLIP )
if ( mpWindowImpl->mnParentClipMode & ParentClipMode::Clip )
pNewParent->mpWindowImpl->mbClipChildren = true;
ImplUpdateWindowPtr();
if ( ImplUpdatePos() )

2
vcl/source/window/syschild.cxx
View File

@ -114,7 +114,7 @@ void SystemChildWindow::ImplInitSysChild( vcl::Window* pParent, WinBits nStyle,
if ( GetSystemData() )
{
mpWindowImpl->mpSysObj->SetCallback( this, ImplSysChildProc );
SetParentClipMode( PARENTCLIPMODE_CLIP );
SetParentClipMode( ParentClipMode::Clip );
SetBackground();
}
}

4
vcl/source/window/tabpage.cxx
View File

@ -52,14 +52,14 @@ void TabPage::ImplInitSettings()
if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() )
{
EnableChildTransparentMode( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
SetBackground();
}
else
{
EnableChildTransparentMode( false );
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
SetPaintTransparent( false );
if ( IsControlBackground() )

12
vcl/source/window/toolbox.cxx
View File

@ -1450,7 +1450,7 @@ void ToolBox::ApplySettings(vcl::RenderContext& rRenderContext)
aColor = GetControlBackground();
SetBackground( aColor );
SetPaintTransparent(false);
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
}
else
{
@ -1461,7 +1461,7 @@ void ToolBox::ApplySettings(vcl::RenderContext& rRenderContext)
rRenderContext.SetBackground();
rRenderContext.SetTextColor(rStyleSettings.GetMenuBarTextColor());
SetPaintTransparent(true);
SetParentClipMode(PARENTCLIPMODE_NOCLIP);
SetParentClipMode(ParentClipMode::NoClip);
mpData->maDisplayBackground = Wallpaper(rStyleSettings.GetFaceColor());
}
else
@ -1473,7 +1473,7 @@ void ToolBox::ApplySettings(vcl::RenderContext& rRenderContext)
rRenderContext.SetBackground(aColor);
SetPaintTransparent(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
}
}
}
@ -1513,7 +1513,7 @@ void ToolBox::ImplInitSettings(bool bFont, bool bForeground, bool bBackground)
aColor = GetControlBackground();
SetBackground( aColor );
SetPaintTransparent(false);
SetParentClipMode( 0 );
SetParentClipMode( ParentClipMode::NONE );
}
else
{
@ -1524,7 +1524,7 @@ void ToolBox::ImplInitSettings(bool bFont, bool bForeground, bool bBackground)
SetBackground();
SetTextColor(rStyleSettings.GetMenuBarTextColor());
SetPaintTransparent( true );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
SetParentClipMode( ParentClipMode::NoClip );
mpData->maDisplayBackground = Wallpaper( rStyleSettings.GetFaceColor() );
}
else
@ -1536,7 +1536,7 @@ void ToolBox::ImplInitSettings(bool bFont, bool bForeground, bool bBackground)
SetBackground(aColor);
SetPaintTransparent(false);
SetParentClipMode(0);
SetParentClipMode(ParentClipMode::NONE);
}
}
}

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

@ -646,7 +646,7 @@ WindowImpl::WindowImpl( WindowType nType )
mnGetFocusFlags = GetFocusFlags::NONE; // Flags fuer GetFocus()-Aufruf
mnWaitCount = 0; // Wait-Count (>1 == Warte-MousePointer)
mnPaintFlags = 0; // Flags for ImplCallPaint
mnParentClipMode = 0; // Flags for Parent-ClipChildren-Mode
mnParentClipMode = ParentClipMode::NONE; // Flags for Parent-ClipChildren-Mode
mnActivateMode = ActivateModeFlags::NONE; // Will be converted in System/Overlap-Windows
mnDlgCtrlFlags = DialogControlFlags::NONE; // DialogControl-Flags
mnLockCount = 0; // LockCount