diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /vcl/source/control/group.cxx | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'vcl/source/control/group.cxx')
| -rw-r--r-- | vcl/source/control/group.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 320cade9ee77..47f97a55a28b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -45,7 +45,7 @@ WinBits GroupBox::ImplInitStyle( WinBits nStyle ) return nStyle; } -const Font& GroupBox::GetCanonicalFont( const StyleSettings& _rStyle ) const +const vcl::Font& GroupBox::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupFont(); } @@ -198,7 +198,7 @@ void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); - Font aFont = GetDrawPixelFont( pDev ); + vcl::Font aFont = GetDrawPixelFont( pDev ); pDev->Push(); pDev->SetMapMode(); |