diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-01-16 15:17:56 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-16 15:34:47 +0000 |
| commit | 41991c7521dd33f45ec3dadfed34c5d2a24fb288 (patch) | |
| tree | 7bc5db4757d9768b90df2f5a7f42ecd98b7f6291 /vcl | |
| parent | d9fa47c4dcbf95f5d3ca07fc3815d8ab9b2468eb (diff) | |
vcl: more back-port cleanup
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 250ed1ced7e5..1f3f0d009bf0 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2795,7 +2795,7 @@ SalColormap::SalColormap( const BitmapPalette &rPalette ) m_nWhitePixel( SALCOLOR_NONE ), m_nBlackPixel( SALCOLOR_NONE ), m_nUsed( rPalette.GetEntryCount() ), - m_nScreen( GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() ) + m_nXScreen( m_pDisplay ? m_pDisplay->GetDefaultXScreen() : SalX11Screen( 0 ) ) { m_aPalette = std::vector<SalColor>(m_nUsed); @@ -2925,7 +2925,7 @@ SalColormap::~SalColormap() // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= void SalColormap::SetPalette( const BitmapPalette &rPalette ) { - if( this != &GetGenericData()->GetSalDisplay()->GetColormap(m_nScreen) ) + if( this != &GetGenericData()->GetSalDisplay()->GetColormap(m_nXScreen) ) { m_nBlackPixel = SALCOLOR_NONE; m_nWhitePixel = SALCOLOR_NONE; |