diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-06 13:21:28 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-06 13:21:28 +0000 |
| commit | 87825974b2521d38fc93198053b638c89dc434ab (patch) | |
| tree | 8f51051ff10777bb21bea92aa0242d5ee49076df /vcl | |
| parent | d3551a51ac9dc12131cd965aa35e5347a4b94cf8 (diff) | |
INTEGRATION: CWS ka009 (1.24.36); FILE MERGED
2007/06/06 13:15:04 ka 1.24.36.4: resolved conflicts
2007/01/04 18:03:36 ka 1.24.36.3: RESYNC: (1.25-1.26); FILE MERGED
2006/10/13 16:35:50 ka 1.24.36.2: RESYNC: (1.24-1.25); FILE MERGED
2006/07/12 22:03:53 ka 1.24.36.1: #i66680#: added patch for optimized ImageList handling
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 0c5cfcd23098..c120a7d07483 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: brdwin.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:29:48 $ + * last change: $Author: ihi $ $Date: 2007-06-06 14:21:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -98,11 +98,15 @@ static void ImplGetPinImage( USHORT nStyle, BOOL bPinIn, Image& rImage ) ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maCtrlData.mpPinImgList ) { - Bitmap aBmp; ResMgr* pResMgr = ImplGetResMgr(); + pSVData->maCtrlData.mpPinImgList = new ImageList(); if( pResMgr ) - aBmp = Bitmap( ResId( SV_RESID_BITMAP_PIN, *pResMgr ) ); - pSVData->maCtrlData.mpPinImgList = new ImageList( aBmp, Color( 0x00, 0x00, 0xFF ), 4 ); + { + Color aMaskColor( 0x00, 0x00, 0xFF ); + pSVData->maCtrlData.mpPinImgList->InsertFromHorizontalBitmap + ( ResId( SV_RESID_BITMAP_PIN, *pResMgr ), 4, + &aMaskColor, NULL, NULL, 0); + } } // Image ermitteln und zurueckgeben |