diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-06 13:21:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-06 13:21:39 +0000 |
| commit | 79d3fc3e8d93ea7e8369fe18183e4b31db7c5ca6 (patch) | |
| tree | 36acb91c93c38106e0142131514829879810f45d /vcl/source/window/msgbox.cxx | |
| parent | 87825974b2521d38fc93198053b638c89dc434ab (diff) | |
INTEGRATION: CWS ka009 (1.18.36); FILE MERGED
2007/06/06 13:10:15 ka 1.18.36.3: resolved conflicts
2006/10/13 16:39:17 ka 1.18.36.2: RESYNC: (1.18-1.19); FILE MERGED
2006/07/12 22:03:53 ka 1.18.36.1: #i66680#: added patch for optimized ImageList handling
Diffstat (limited to 'vcl/source/window/msgbox.cxx')
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index ca8f2537303a..366ece46e1d7 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: msgbox.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:30:28 $ + * last change: $Author: ihi $ $Date: 2007-06-06 14:21:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,15 +87,13 @@ static void ImplInitMsgBoxImageList() { BitmapEx aBmpEx; ResMgr* pResMgr = ImplGetResMgr(); + pSVData->maWinData.mpMsgBoxImgList = new ImageList(4); if( pResMgr ) { - aBmpEx = BitmapEx( ResId( SV_RESID_BITMAP_MSGBOX, *pResMgr ) ); - - if( !aBmpEx.IsTransparent() ) - aBmpEx = BitmapEx( aBmpEx.GetBitmap(), Color( 0xC0, 0xC0, 0xC0 ) ); - } - - pSVData->maWinData.mpMsgBoxImgList = new ImageList( aBmpEx, 4 ); + Color aNonAlphaMask( 0xC0, 0xC0, 0xC0 ); + pSVData->maWinData.mpMsgBoxImgList->InsertFromHorizontalBitmap + ( ResId( SV_RESID_BITMAP_MSGBOX, *pResMgr ), 4, &aNonAlphaMask ); + } } } |