diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-20 18:25:49 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-20 19:44:25 +0900 |
| commit | 9c869aecc83dc3899a0941058acfcac791fca519 (patch) | |
| tree | 0acffaf6b7fc6ba39199aed365667d7899b1296b /vcl | |
| parent | 00920bf83688f185bf05070599e7083af01ac665 (diff) | |
fixes for changes in "edit"
Change-Id: Ied0f44e38ac52f13c9c229366342849aa29ec754
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/button.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/spinfld.cxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 7714c240ed02..2f86babddcc9 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -961,7 +961,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa if (aCtrlType == CTRL_COMBOBOX) { Edit* pEdit = static_cast<Edit*>(GetParent()); - if (pEdit->ImplUseNativeBorder(pEdit->GetStyle())) + if (pEdit->ImplUseNativeBorder(rRenderContext, pEdit->GetStyle())) bNativeOK = true; } else if (GetParent()->IsNativeControlSupported(aCtrlType, HAS_BACKGROUND_TEXTURE)) diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index aeef55b244d4..82559d5a3225 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -304,7 +304,7 @@ void SpinField::ImplInit( vcl::Window* pParent, WinBits nWinStyle ) // Some themes want external spin buttons, therefore the main // spinfield should not overdraw the border between its encapsulated // edit field and the spin buttons - if ( (nWinStyle & WB_SPIN) && ImplUseNativeBorder( nWinStyle ) ) + if ((nWinStyle & WB_SPIN) && ImplUseNativeBorder(*this, nWinStyle)) { SetBackground(); mpEdit.set( VclPtr<Edit>::Create( this, WB_NOBORDER ) ); @@ -808,21 +808,18 @@ void SpinField::StateChanged( StateChangedType nType ) { if ( mpEdit ) mpEdit->SetControlFont( GetControlFont() ); - ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == StateChangedType::ControlForeground ) { if ( mpEdit ) mpEdit->SetControlForeground( GetControlForeground() ); - ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == StateChangedType::ControlBackground ) { if ( mpEdit ) mpEdit->SetControlBackground( GetControlBackground() ); - ImplInitSettings( false, false, true ); Invalidate(); } else if( nType == StateChangedType::Mirroring ) |