diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-18 10:36:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 10:36:13 +0200 |
| commit | f4dc53cb33c7f6b10bb6709dea5f8195bf95d4b5 (patch) | |
| tree | bd29c3f3f664f68cc4bff323a4f4d54cf27dfd34 | |
| parent | b5297255bd9830c04dc7b7e3d47660809992aec6 (diff) | |
Use vcl::Font
Change-Id: Ic1b66c43697e342bebdf8b5cd6f0bb419f4a4fa7
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 8c129eb0fb74..63a5dc1d6c62 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2586,7 +2586,7 @@ inline Color ImplWinColorToSal( COLORREF nColor ) return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) ); } -static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) +static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Font& rFont ) { ImplSalLogFontToFontW( hDC, rLogFont, rFont ); @@ -2761,12 +2761,12 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetHighContrastMode( false ); // Query Fonts - Font aMenuFont = aStyleSettings.GetMenuFont(); - Font aTitleFont = aStyleSettings.GetTitleFont(); - Font aFloatTitleFont = aStyleSettings.GetFloatTitleFont(); - Font aHelpFont = aStyleSettings.GetHelpFont(); - Font aAppFont = aStyleSettings.GetAppFont(); - Font aIconFont = aStyleSettings.GetIconFont(); + vcl::Font aMenuFont = aStyleSettings.GetMenuFont(); + vcl::Font aTitleFont = aStyleSettings.GetTitleFont(); + vcl::Font aFloatTitleFont = aStyleSettings.GetFloatTitleFont(); + vcl::Font aHelpFont = aStyleSettings.GetHelpFont(); + vcl::Font aAppFont = aStyleSettings.GetAppFont(); + vcl::Font aIconFont = aStyleSettings.GetIconFont(); HDC hDC = GetDC( 0 ); NONCLIENTMETRICSW aNonClientMetrics; aNonClientMetrics.cbSize = sizeof( aNonClientMetrics ); |