diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 18:26:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 18:29:31 +0100 |
| commit | 3042fa532a9b26203491b36f94d709c3b73e46ff (patch) | |
| tree | 11b75a3e6f3d71e930b71a456eac57439386edd3 /vcl/unx/generic/gdi/salvd.cxx | |
| parent | 967331ef6a2765b7021bf835ce85f783257a936c (diff) | |
Move SalGenericData::GetSalDisplay() out of generic/gendata.hxx
...as it needs SalDisplay to be a complete type, but unx/saldisp.hxx depends on
X11 headers and can thus e.g. not be included in generic/gendata.hxx on Android.
Change-Id: Iec5f51408eef0d6eb7e2d04105a7408372b06079
Diffstat (limited to 'vcl/unx/generic/gdi/salvd.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index b4bcfa16edb5..3ec516bd038d 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -94,7 +94,7 @@ X11SalVirtualDevice::X11SalVirtualDevice( SalGraphics* pGraphics, if( !nBitCount && pGraphics ) nBitCount = pGraphics->GetBitCount(); - pDisplay_ = GetGenericData()->GetSalDisplay(); + pDisplay_ = vcl_sal::getSalDisplay(GetGenericData()); pGraphics_ = new X11SalGraphics(); nDepth_ = nBitCount; @@ -124,7 +124,7 @@ X11SalVirtualDevice::X11SalVirtualDevice( SalGraphics* pGraphics, nDX_ = nDX; nDY_ = nDY; m_nXScreen = pGraphics ? static_cast<X11SalGraphics*>(pGraphics)->GetScreenNumber() : - GetGenericData()->GetSalDisplay()->GetDefaultXScreen(); + vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen(); hDrawable_ = limitXCreatePixmap( GetXDisplay(), pDisplay_->GetDrawable( m_nXScreen ), nDX_, nDY_, |