diff options
| author | Stephan Schäfer <ssa@openoffice.org> | 2001-04-27 13:46:33 +0000 |
|---|---|---|
| committer | Stephan Schäfer <ssa@openoffice.org> | 2001-04-27 13:46:33 +0000 |
| commit | 4b661ea732c6e89b2040e38ad7f349614c409615 (patch) | |
| tree | f7ed0705c8045d02ea626853e00dfbc80799cff4 /vcl/win | |
| parent | 99d9e3ebb17af5ec35b79cd6b2fa9efb4e2d13bc (diff) | |
support multiple icons
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 776a88c59527..a6170788f546 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: th $ $Date: 2000-12-14 13:39:14 $ + * last change: $Author: ssa $ $Date: 2001-04-27 14:46:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -821,8 +821,18 @@ void SalFrame::SetTitle( const XubString& rTitle ) void SalFrame::SetIcon( USHORT nIcon ) { -// ImplSendMessage( maFrameData.mhWnd, WM_SETICON, FALSE, hSmIcon ); -// ImplSendMessage( maFrameData.mhWnd, WM_SETICON, TRUE, hIcon ); + HICON hIcon = NULL, hSmIcon = NULL; + + if( nIcon ) // 0 means default (class) icon + { + ImplLoadSalIcon( nIcon, hIcon, hSmIcon ); + + DBG_ASSERT( hIcon , "SalFrame::SetIcon(): Could not load large icon !" ); + DBG_ASSERT( hSmIcon , "SalFrame::SetIcon(): Could not load small icon !" ); + } + + ImplSendMessage( maFrameData.mhWnd, WM_SETICON, ICON_BIG, (long) hIcon ); + ImplSendMessage( maFrameData.mhWnd, WM_SETICON, ICON_SMALL, (long) hSmIcon ); } // ----------------------------------------------------------------------- |