This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO419 by this push:
new 1b00c71 #i127815# use new app icon for OS/2 windows. Always set icon
for frame windows. Add dependancies list to build system.
1b00c71 is described below
commit 1b00c71b67bac457029f0dc3644d5b8a237d4a92
Author: Yuri Dario <[email protected]>
AuthorDate: Tue Sep 11 14:01:55 2018 +0000
#i127815# use new app icon for OS/2 windows. Always set icon for frame
windows. Add dependancies list to build system.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1840571
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e0343f614d03cf718f5b839a5c8d7789dfb6ecd7)
---
main/vcl/WinResTarget_vcl.mk | 79 ++++++++++++++++++++++++++++++++
main/vcl/os2/source/src/salsrc.rc | 2 +-
main/vcl/os2/source/src/sd.ico | Bin 3344 -> 11312 bytes
main/vcl/os2/source/src/sd2.ico | Bin 5604 -> 0 bytes
main/vcl/os2/source/window/salframe.cxx | 5 +-
5 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 608c09b..74e99a4 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -126,6 +126,85 @@ $(eval $(call gb_WinResTarget_add_file,vcl/src,\
vcl/os2/source/src/salsrc \
))
+$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
+ vcl/os2/source/src/airbrush.ptr \
+ vcl/os2/source/src/ase.ptr \
+ vcl/os2/source/src/asn.ptr \
+ vcl/os2/source/src/asne.ptr \
+ vcl/os2/source/src/asns.ptr \
+ vcl/os2/source/src/asnswe.ptr \
+ vcl/os2/source/src/asnw.ptr \
+ vcl/os2/source/src/ass.ptr \
+ vcl/os2/source/src/asse.ptr \
+ vcl/os2/source/src/assw.ptr \
+ vcl/os2/source/src/asw.ptr \
+ vcl/os2/source/src/aswe.ptr \
+ vcl/os2/source/src/chain.ptr \
+ vcl/os2/source/src/chainnot.ptr \
+ vcl/os2/source/src/chart.ptr \
+ vcl/os2/source/src/copydata.ptr \
+ vcl/os2/source/src/copydlnk.ptr \
+ vcl/os2/source/src/copyf.ptr \
+ vcl/os2/source/src/copyf2.ptr \
+ vcl/os2/source/src/copyflnk.ptr \
+ vcl/os2/source/src/crook.ptr \
+ vcl/os2/source/src/crop.ptr \
+ vcl/os2/source/src/cross.ptr \
+ vcl/os2/source/src/darc.ptr \
+ vcl/os2/source/src/dbezier.ptr \
+ vcl/os2/source/src/dcapt.ptr \
+ vcl/os2/source/src/dcirccut.ptr \
+ vcl/os2/source/src/dconnect.ptr \
+ vcl/os2/source/src/dellipse.ptr \
+ vcl/os2/source/src/detectiv.ptr \
+ vcl/os2/source/src/dfree.ptr \
+ vcl/os2/source/src/dline.ptr \
+ vcl/os2/source/src/dpie.ptr \
+ vcl/os2/source/src/dpolygon.ptr \
+ vcl/os2/source/src/drect.ptr \
+ vcl/os2/source/src/dtext.ptr \
+ vcl/os2/source/src/dtext.ptr \
+ vcl/os2/source/src/fill.ptr \
+ vcl/os2/source/src/hand.ptr \
+ vcl/os2/source/src/help.ptr \
+ vcl/os2/source/src/hshear.ptr \
+ vcl/os2/source/src/hsizebar.ptr \
+ vcl/os2/source/src/hsplit.ptr \
+ vcl/os2/source/src/linkdata.ptr \
+ vcl/os2/source/src/linkf.ptr \
+ vcl/os2/source/src/magnify.ptr \
+ vcl/os2/source/src/mirror.ptr \
+ vcl/os2/source/src/move.ptr \
+ vcl/os2/source/src/movebw.ptr \
+ vcl/os2/source/src/movedata.ptr \
+ vcl/os2/source/src/movedlnk.ptr \
+ vcl/os2/source/src/movef.ptr \
+ vcl/os2/source/src/movef2.ptr \
+ vcl/os2/source/src/moveflnk.ptr \
+ vcl/os2/source/src/movept.ptr \
+ vcl/os2/source/src/nullptr.ptr \
+ vcl/os2/source/src/pen.ptr \
+ vcl/os2/source/src/pivotcol.ptr \
+ vcl/os2/source/src/pivotfld.ptr \
+ vcl/os2/source/src/pivotrow.ptr \
+ vcl/os2/source/src/pntbrsh.ptr \
+ vcl/os2/source/src/refhand.ptr \
+ vcl/os2/source/src/rotate.ptr \
+ vcl/os2/source/src/salsrc.rc \
+ vcl/os2/source/src/sd.ico \
+ vcl/os2/source/src/tblsele.ptr \
+ vcl/os2/source/src/tblsels.ptr \
+ vcl/os2/source/src/tblselse.ptr \
+ vcl/os2/source/src/tblselsw.ptr \
+ vcl/os2/source/src/tblselw.ptr \
+ vcl/os2/source/src/timemove.ptr \
+ vcl/os2/source/src/timesize.ptr \
+ vcl/os2/source/src/vshear.ptr \
+ vcl/os2/source/src/vsizebar.ptr \
+ vcl/os2/source/src/vsplit.ptr \
+ vcl/os2/source/src/vtext.ptr \
+))
+
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/os2/source/src \
diff --git a/main/vcl/os2/source/src/salsrc.rc
b/main/vcl/os2/source/src/salsrc.rc
index 2b79cc1..8665a3b 100644
--- a/main/vcl/os2/source/src/salsrc.rc
+++ b/main/vcl/os2/source/src/salsrc.rc
@@ -100,5 +100,5 @@ POINTER SAL_RESID_POINTER_TAB_SELECT_W
TBLSELW.PTR
POINTER SAL_RESID_POINTER_TAB_SELECT_SW TBLSELSW.PTR
POINTER SAL_RESID_POINTER_PAINTBRUSH PNTBRSH.PTR
-ICON SAL_RESID_ICON_DEFAULT
SD2.ICO
+ICON SAL_RESID_ICON_DEFAULT
SD.ICO
diff --git a/main/vcl/os2/source/src/sd.ico b/main/vcl/os2/source/src/sd.ico
index 22cb336..ed46567 100644
Binary files a/main/vcl/os2/source/src/sd.ico and
b/main/vcl/os2/source/src/sd.ico differ
diff --git a/main/vcl/os2/source/src/sd2.ico b/main/vcl/os2/source/src/sd2.ico
deleted file mode 100644
index f7edd45..0000000
Binary files a/main/vcl/os2/source/src/sd2.ico and /dev/null differ
diff --git a/main/vcl/os2/source/window/salframe.cxx
b/main/vcl/os2/source/window/salframe.cxx
index f12c92a..781d5c2 100644
--- a/main/vcl/os2/source/window/salframe.cxx
+++ b/main/vcl/os2/source/window/salframe.cxx
@@ -683,9 +683,8 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND
hWndParent, ULONG nSal
if ( pParentFrame )
pFrame->mpParentFrame = pParentFrame;
- // Icon setzen (YD win32 does it in the class registration)
- if ( nFrameFlags & FCF_MINBUTTON )
- WinSendMsg( hWndFrame, WM_SETICON, (MPARAM)pInst->mhAppIcon, (MPARAM)0
);
+ // since os2 windows always have a close button, always set icon
+ WinSendMsg( hWndFrame, WM_SETICON, (MPARAM)pInst->mhAppIcon, (MPARAM)0 );
// If we have an Window with an Caption Bar and without
// an MaximizeBox, we change the SystemMenu
