diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-11-02 03:31:00 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 07:58:45 +0100 |
| commit | 5368923b47e908caf7112eb23629cc76cc7e6249 (patch) | |
| tree | f1f621c709f784552dd2e2b5c3fc13bf741b9833 /vcl/win/source/gdi/salvd.cxx | |
| parent | 69cae240078a2244ccc23317b4dadec7d5b8c8f0 (diff) | |
at least some sanity for WinSalGraphics
we no longer invite everyone to change our member variables.
This was obviously written by a C programmer and needs further refactoring.
Change-Id: I896576a5abc24e8d03787d30e6ba6c11b0bf84c6
Diffstat (limited to 'vcl/win/source/gdi/salvd.cxx')
| -rw-r--r-- | vcl/win/source/gdi/salvd.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 820f12f6f125..2269debcd1a8 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -109,10 +109,10 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics, pVirGraphics->setHDC(hDC); if ( pSalData->mhDitherPal && pVirGraphics->isScreen() ) { - pVirGraphics->mhDefPal = SelectPalette( hDC, pSalData->mhDitherPal, TRUE ); + pVirGraphics->setDefPal(SelectPalette( hDC, pSalData->mhDitherPal, TRUE )); RealizePalette( hDC ); } - ImplSalInitGraphics( pVirGraphics ); + pVirGraphics->InitGraphics(); pVDev->setHDC(hDC); pVDev->mhBmp = hBmp; @@ -163,9 +163,9 @@ WinSalVirtualDevice::~WinSalVirtualDevice() *ppVirDev = mpNext; // destroy saved DC - if( mpGraphics->mhDefPal ) - SelectPalette( mpGraphics->getHDC(), mpGraphics->mhDefPal, TRUE ); - ImplSalDeInitGraphics( mpGraphics ); + if( mpGraphics->getDefPal() ) + SelectPalette( mpGraphics->getHDC(), mpGraphics->getDefPal(), TRUE ); + mpGraphics->InitGraphics(); if( mhDefBmp ) SelectBitmap( mpGraphics->getHDC(), mhDefBmp ); if( !mbForeignDC ) |