diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 16:08:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 20:52:29 +0100 |
| commit | 57a1b2277df803387181f44ec70f4fa61c3fba4e (patch) | |
| tree | fbf7bdb293ef1b3db4c4b5c5b44d6e640ef762a6 /vcl | |
| parent | 183b2ff719364a17f1f21d7ba445e12c55d94871 (diff) | |
now ditch WB_INFO
Change-Id: I3b5505e06989c6bb8df5977b6690d32ca5f161e2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/fixed.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 0164ce85cab8..ce01670c879a 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -37,7 +37,7 @@ WB_LEFT | WB_CENTER | WB_RIGHT | \ WB_TOP | WB_VCENTER | WB_BOTTOM | \ WB_WORDBREAK | WB_NOLABEL | \ - WB_INFO | WB_PATHELLIPSIS) + WB_PATHELLIPSIS) #define FIXEDLINE_VIEW_STYLE (WB_3DLOOK | WB_NOLABEL) #define FIXEDBITMAP_VIEW_STYLE (WB_3DLOOK | \ WB_LEFT | WB_CENTER | WB_RIGHT | \ @@ -96,12 +96,12 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle ) const vcl::Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const { - return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont(); + return _rStyle.GetLabelFont(); } const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { - return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor(); + return _rStyle.GetLabelTextColor(); } FixedText::FixedText( vcl::Window* pParent, WinBits nStyle ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 9b60717c6228..5884a7316c40 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -96,7 +96,7 @@ static bool ImplIsMnemonicCtrl( vcl::Window* pWindow ) return true; //This is the legacy pre-layout logic which we retain //until we can be sure we can remove it - if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) ) + if (pWindow->GetStyle() & WB_NOLABEL) return false; vcl::Window* pNextWindow = pWindow->GetWindow( GetWindowType::Next ); if ( !pNextWindow ) |