openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1840571 - in /openoffice/trunk/main/vcl: WinResTarget_vcl.mk os2/source/src/salsrc.rc os2/source/src/sd.ico os2/source/src/sd2.ico os2/source/window/salframe.cxx
Date Tue, 11 Sep 2018 14:01:55 GMT
Author: ydario
Date: Tue Sep 11 14:01:55 2018
New Revision: 1840571

URL: http://svn.apache.org/viewvc?rev=1840571&view=rev
Log:
#i127815# use new app icon for OS/2 windows. Always set icon for frame
windows. Add dependancies list to build system.

Removed:
    openoffice/trunk/main/vcl/os2/source/src/sd2.ico
Modified:
    openoffice/trunk/main/vcl/WinResTarget_vcl.mk
    openoffice/trunk/main/vcl/os2/source/src/salsrc.rc
    openoffice/trunk/main/vcl/os2/source/src/sd.ico
    openoffice/trunk/main/vcl/os2/source/window/salframe.cxx

Modified: openoffice/trunk/main/vcl/WinResTarget_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/WinResTarget_vcl.mk?rev=1840571&r1=1840570&r2=1840571&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/WinResTarget_vcl.mk (original)
+++ openoffice/trunk/main/vcl/WinResTarget_vcl.mk Tue Sep 11 14:01:55 2018
@@ -126,6 +126,85 @@ $(eval $(call gb_WinResTarget_add_file,v
 	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 \

Modified: openoffice/trunk/main/vcl/os2/source/src/salsrc.rc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/src/salsrc.rc?rev=1840571&r1=1840570&r2=1840571&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/os2/source/src/salsrc.rc (original)
+++ openoffice/trunk/main/vcl/os2/source/src/salsrc.rc Tue Sep 11 14:01:55 2018
@@ -100,5 +100,5 @@ POINTER 	SAL_RESID_POINTER_TAB_SELECT_W
 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
 

Modified: openoffice/trunk/main/vcl/os2/source/src/sd.ico
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/src/sd.ico?rev=1840571&r1=1840570&r2=1840571&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/trunk/main/vcl/os2/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/window/salframe.cxx?rev=1840571&r1=1840570&r2=1840571&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/os2/source/window/salframe.cxx (original)
+++ openoffice/trunk/main/vcl/os2/source/window/salframe.cxx Tue Sep 11 14:01:55 2018
@@ -683,9 +683,8 @@ SalFrame* ImplSalCreateFrame( Os2SalInst
     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



Mime
View raw message