diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-03 12:21:34 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:51 +0100 |
| commit | a4d7b25e7a006c3105a226343bfb52d9e1bc356a (patch) | |
| tree | d84cd975f087ca9fbb24fa0de2e5ae168b9eff72 /vcl/unx/generic/gdi/salvd.cxx | |
| parent | 9b51808742ae4236b582b2693578e8db8e126a13 (diff) | |
generic: create shared display class and re-factor to use it
Diffstat (limited to 'vcl/unx/generic/gdi/salvd.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 0bb34519bd8f..b02f8af6a823 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -58,7 +58,7 @@ SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics, XLIB_Window aRoot; int x, y; unsigned int w = 0, h = 0, bw, d; - Display* pDisp = GetX11SalData()->GetDisplay()->GetDisplay(); + Display* pDisp = GetGenericData()->GetSalDisplay()->GetDisplay(); XGetGeometry( pDisp, pData->hDrawable, &aRoot, &x, &y, &w, &h, &bw, &d ); int nScreen = 0; @@ -70,16 +70,16 @@ SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics, } nDX = (long)w; nDY = (long)h; - if( !pVDev->Init( GetX11SalData()->GetDisplay(), nDX, nDY, nBitCount, nScreen, pData->hDrawable, + if( !pVDev->Init( GetGenericData()->GetSalDisplay(), nDX, nDY, nBitCount, nScreen, pData->hDrawable, static_cast< XRenderPictFormat* >( pData->pXRenderFormat )) ) { delete pVDev; return NULL; } } - else if( !pVDev->Init( GetX11SalData()->GetDisplay(), nDX, nDY, nBitCount, + else if( !pVDev->Init( GetGenericData()->GetSalDisplay(), nDX, nDY, nBitCount, pGraphics ? static_cast<X11SalGraphics*>(pGraphics)->GetScreenNumber() : - GetX11SalData()->GetDisplay()->GetDefaultScreenNumber() ) ) + GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() ) ) { delete pVDev; return NULL; |