diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-20 09:10:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-21 09:06:40 +0200 |
| commit | 182fc4f184b77330fdbb32096b64f5fbc5b5f874 (patch) | |
| tree | 1ba73fb9188796ed43976fe32f291f9c64fb1d5b /vcl/source/control | |
| parent | 43327878920f424f8bac1114bee51c54609796c5 (diff) | |
fdo#84938: replace WINDOW_BORDER constants with enum
Change-Id: I91ca8e09971aee26f16257a4fd01125cfb2ebcdb
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/imgctrl.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/prgsbar.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index d03b32184b6f..b69e9fd5c8a9 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1362,7 +1362,7 @@ Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const return aRect; } -void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) +void ComboBox::SetBorderStyle( WindowBorderStyle nBorderStyle ) { Window::SetBorderStyle( nBorderStyle ); if ( !IsDropDownBox() ) diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index d7a0f8d82bc3..a0d3da11eccd 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -467,7 +467,7 @@ SelectableFixedText::SelectableFixedText(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) { // no border - SetBorderStyle( WINDOW_BORDER_NOBORDER ); + SetBorderStyle( WindowBorderStyle::NOBORDER ); // read-only SetReadOnly(); // make it transparent diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 6a8082fb5de2..efd64c825d68 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -139,7 +139,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) { vcl::Window *pWin = GetWindow( WINDOW_BORDER ); - bool bFlat = (GetBorderStyle() == 2); + bool bFlat = (GetBorderStyle() == WindowBorderStyle::MONO); Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() ); Color oldLineCol = pWin->GetLineColor(); Color oldFillCol = pWin->GetFillColor(); diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 1536f9336b09..4dc523c8aafb 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -82,7 +82,7 @@ void ProgressBar::ImplInitSettings( bool bFont, IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) ) { if( (GetStyle() & WB_BORDER) ) - SetBorderStyle( WINDOW_BORDER_REMOVEBORDER ); + SetBorderStyle( WindowBorderStyle::REMOVEBORDER ); EnableChildTransparentMode( true ); SetPaintTransparent( true ); SetBackground(); |