diff --git a/harbour/ChangeLog b/harbour/ChangeLog index eaf0c97a77..e7b51e7cce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-17 13:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/wapi_wingdi.c + + WAPI_TEXTOUT(): Emulating functionality on WinCE platform, + so it's now available also on WinCE. + + * contrib/hbwin/win_prn1.c + * Formatting. + 2010-02-17 13:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/wapi_wingdi.c ! Typo in recent commit. diff --git a/harbour/contrib/hbwin/wapi_wingdi.c b/harbour/contrib/hbwin/wapi_wingdi.c index 703854867f..95e99a9e5b 100644 --- a/harbour/contrib/hbwin/wapi_wingdi.c +++ b/harbour/contrib/hbwin/wapi_wingdi.c @@ -531,7 +531,6 @@ HB_FUNC( WAPI_GETTEXTALIGN ) HB_FUNC( WAPI_TEXTOUT ) { -#if ! defined( HB_OS_WIN_CE ) HDC hDC = hbwapi_par_HDC( 1 ); if( hDC ) @@ -540,18 +539,28 @@ HB_FUNC( WAPI_TEXTOUT ) HB_SIZE nDataLen; LPCTSTR lpData = HB_PARSTR( 4, &hData, &nDataLen ); +#if ! defined( HB_OS_WIN_CE ) hb_retl( TextOut( hDC, hb_parni( 2 ) /* iRow */, hb_parni( 3 ) /* iCol */, lpData, nDataLen ) ); +#else + /* Emulating TextOut() using ExtTextOut(). [vszakats] */ + hb_retl( ExtTextOut( hDC, hb_parni( 2 ) /* iRow */, + hb_parni( 3 ) /* iCol */, + 0, + NULL, + lpData, + ( UINT ) nDataLen, + NULL ) ); +#endif hb_strfree( hData ); } else hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); -#else + hb_retnl( HB_FALSE ); -#endif } HB_FUNC( WAPI_EXTTEXTOUT ) diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c index b4acdeb3dc..a34e7cfdc9 100644 --- a/harbour/contrib/hbwin/win_prn1.c +++ b/harbour/contrib/hbwin/win_prn1.c @@ -164,7 +164,6 @@ HB_FUNC( WIN_ENDPAGE ) HB_FUNC( WIN_TEXTOUT ) { long lResult = 0; - HDC hDC = hbwapi_par_HDC( 1 ); if( hDC && HB_ISCHAR( 4 ) )