diff options
| -rw-r--r-- | RepositoryFixes.mk | 3 | ||||
| -rw-r--r-- | packimages/pack/makefile.mk | 4 | ||||
| -rw-r--r-- | solenv/bin/hicontrast-to-theme.pl | 3 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 1 | ||||
| -rw-r--r-- | vcl/os2/source/window/salobj.cxx | 8 |
6 files changed, 17 insertions, 6 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index fa278bc66b9b..cfbf51d14acd 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -183,9 +183,8 @@ gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst sb:sb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) -#gb_Library_FILENAMES := $(patsubst sot:sot%,sot:isot%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svl:isvl%,svl:svl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index 632f70569563..94571c49a5f2 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -66,11 +66,7 @@ $(COMMONBIN)$/images_brand.zip: # generate the HiContrast icon set $(MISC)$/hicontrast.flag .PHONY : -.IF "$(GUI)"=="OS2" - touch $(MISC)$/hicontrast.flag -.ELSE $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ -.ENDIF # unpack the classic icon set $(MISC)$/classic.flag : $(CLASSIC_TARBALL) diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl index 525027e4a1b9..ea5b8e38b5b5 100644 --- a/solenv/bin/hicontrast-to-theme.pl +++ b/solenv/bin/hicontrast-to-theme.pl @@ -108,6 +108,9 @@ sub copy_normalized { @from_stat = stat($file); @to_stat = stat($copy); if ( $from_stat[9] > $to_stat[9] ) { + if ( $^O eq 'os2' ) { + $rc = unlink($copy); + } copy( $file, $copy ) || die $!; utime( $from_stat[9], $from_stat[9], $copy ); } diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 2bb9bb8b60c7..17441d611dc2 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -190,7 +190,11 @@ TKTLIB=-ltkt$(DLLPOSTFIX) SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) +.IF "$(GUI)"=="OS2" +BASICLIB=-lbasic +.ELSE BASICLIB=-lsb$(DLLPOSTFIX) +.ENDIF VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX) DBTOOLSLIB=-ldbtools$(DLLPOSTFIX) HM2LIBSH=-lhmwrpdll diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 12641c42ea78..49ce67b02186 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -144,6 +144,7 @@ LS=ls ECHON=echo -n ECHONL=echo .ELIF "$(GUI)"=="OS2" +GPERF*=gperf SED*=sed SORT*=sort PERL*=perl diff --git a/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx index 7afd4b73aba5..3da4699352aa 100644 --- a/vcl/os2/source/window/salobj.cxx +++ b/vcl/os2/source/window/salobj.cxx @@ -198,7 +198,9 @@ MRESULT EXPENTRY SalSysObjChildWndProc( HWND hWnd, ULONG nMsg, MRESULT nRet = 0; int bDef = TRUE; +#if OSL_DEBUG_LEVEL>0 debug_printf( "SalSysObjChildWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg); +#endif switch( nMsg ) { @@ -233,7 +235,9 @@ MRESULT EXPENTRY SalSysObjClipWndProc( HWND hWnd, ULONG nMsg, MRESULT nRet = 0; int bDef = TRUE; +#if OSL_DEBUG_LEVEL>0 debug_printf( "SalSysObjClipWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg); +#endif switch( nMsg ) { @@ -360,8 +364,10 @@ SalObject* ImplSalCreateObject( Os2SalInstance* pInst, Os2SalFrame* pParent ) if ( hWnd ) { +#if OSL_DEBUG_LEVEL>0 debug_printf("ImplSalCreateObject hWndChild %x\n", hWndChild); debug_printf("ImplSalCreateObject hWnd %x\n", hWnd); +#endif pObject->mhWnd = hWnd; pObject->mhWndChild = hWndChild; pObject->maSysData.hWnd = hWndChild; @@ -474,7 +480,9 @@ void Os2SalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight nX, mnHeight-(nY+nHeight), nWidth, nHeight, mhWnd, mhLastClipWnd, 0, NULL, NULL ); +#if OSL_DEBUG_LEVEL>0 debug_printf("Os2SalObject::UnionClipRegion hClipWnd %x\n", hClipWnd); +#endif mhLastClipWnd = hClipWnd; } |