diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:05:00 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:05:00 +0000 |
| commit | 07f7f526178c26a14c7fec8d35f4343795e869e3 (patch) | |
| tree | 4d0d89ea3588cd33cbf67d350ad386b19b3ee862 /vcl | |
| parent | INTEGRATION: CWS impresshydra (1.26.46); FILE MERGED (diff) | |
| download | core-07f7f526178c26a14c7fec8d35f4343795e869e3.tar.gz core-07f7f526178c26a14c7fec8d35f4343795e869e3.zip | |
INTEGRATION: CWS impresshydra (1.19.134); FILE MERGED
2006/09/20 13:49:46 cl 1.19.134.3: RESYNC: (1.19-1.20); FILE MERGED
2006/08/09 14:35:08 pl 1.19.134.2: #i67721# on the way to multiscreen support
2006/08/07 14:44:23 pl 1.19.134.1: #i67721# preparations for multi monitor support
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/soicon.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx index 6b474af01dbc..c88ee2c10714 100644 --- a/vcl/unx/source/app/soicon.cxx +++ b/vcl/unx/source/app/soicon.cxx @@ -4,9 +4,9 @@ * * $RCSfile: soicon.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:36:25 $ + * last change: $Author: kz $ $Date: 2006-10-06 10:05:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,8 +70,7 @@ #endif #include <svids.hrc> - -BOOL SelectAppIconPixmap( SalDisplay *pDisplay, USHORT nIcon, USHORT iconSize, +BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask) { if( ! ImplGetResMgr() ) @@ -101,18 +100,25 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, USHORT nIcon, USHORT iconSize, X11SalBitmap *pBitmap = static_cast < X11SalBitmap * > (aIcon.ImplGetBitmapImpBitmap()->ImplGetSalBitmap()); - icon_pixmap = XCreatePixmap( pDisplay->GetDisplay(), pDisplay->GetRootWindow(), - iconSize, iconSize, pDisplay->GetRootVisual()->GetDepth()); + icon_pixmap = XCreatePixmap( pDisplay->GetDisplay(), + pDisplay->GetRootWindow( nScreen ), + iconSize, iconSize, + DefaultDepth( pDisplay->GetDisplay(), nScreen ) + ); - pBitmap->ImplDraw(icon_pixmap, pDisplay->GetRootVisual()->GetDepth(), - aRect, DefaultGC(pDisplay->GetDisplay(), pDisplay->GetScreenNumber())); + pBitmap->ImplDraw( icon_pixmap, + nScreen, + DefaultDepth( pDisplay->GetDisplay(), nScreen ), + aRect, + DefaultGC(pDisplay->GetDisplay(), nScreen ) ); icon_mask = None; if( TRANSPARENT_BITMAP == aIcon.GetTransparentType() ) { icon_mask = XCreatePixmap( pDisplay->GetDisplay(), - pDisplay->GetRootWindow(), iconSize, iconSize, 1); + pDisplay->GetRootWindow( pDisplay->GetDefaultScreenNumber() ), + iconSize, iconSize, 1); XGCValues aValues; aValues.foreground = 0xffffffff; @@ -127,7 +133,7 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, USHORT nIcon, USHORT iconSize, X11SalBitmap *pMask = static_cast < X11SalBitmap * > (aMask.ImplGetImpBitmap()->ImplGetSalBitmap()); - pMask->ImplDraw(icon_mask, 1, aRect, aMonoGC); + pMask->ImplDraw(icon_mask, nScreen, 1, aRect, aMonoGC); XFreeGC( pDisplay->GetDisplay(), aMonoGC ); } |