diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-12-05 10:10:24 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-12-05 10:16:58 +0100 |
| commit | 30febe7998caa282ea9a7ebb53dd8517d5b2abc6 (patch) | |
| tree | 2dc90796271bc836a4a9c2468eb376cfe91c7940 /vcl/win | |
| parent | a35140f245d774745b806ef12346aa77f0256395 (diff) | |
Revert "remove StarDesktop icon"
This breaks unit tests in svtools.
This reverts commit 915fe51391bdeee79f31173aeedab9746fc88000.
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 1 | ||||
| -rw-r--r-- | vcl/win/source/src/salsrc.rc | 2 | ||||
| -rw-r--r-- | vcl/win/source/src/sd.ico | bin | 0 -> 3310 bytes |
3 files changed, 3 insertions, 0 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d3fce7c7beb1..90841f72a4a9 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -541,6 +541,7 @@ SalInstance* CreateSalInstance() aWndClassEx.hbrBackground = 0; aWndClassEx.lpszMenuName = 0; aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW; + ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, aWndClassEx.hIconSm ); if ( !RegisterClassExW( &aWndClassEx ) ) return NULL; diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 956f862b0c6f..147b80fc3e8c 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -117,4 +117,6 @@ SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur SAL_RESID_BITMAP_50 BITMAP "50.bmp" +SAL_RESID_ICON_DEFAULT ICON sd.ico + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/src/sd.ico b/vcl/win/source/src/sd.ico Binary files differnew file mode 100644 index 000000000000..b2a0a07a67c3 --- /dev/null +++ b/vcl/win/source/src/sd.ico |