diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a4c50e1c67..351853ace0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-18 20:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbwin/win_tprn.prg + ! fixed GetDefaultPrinter() => win_PrinterGetDefault() + + * harbour/contrib/hbwin/win_prn2.c + * harbour/contrib/hbwin/win_prn3.c + ! fixed to compile with WinCE + 2010-01-18 19:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/common/hbwince.c - Deleted definition of FreeResource(). It's noe used anywhere diff --git a/harbour/contrib/hbwin/win_prn2.c b/harbour/contrib/hbwin/win_prn2.c index 2388bf2505..2af74b3e39 100644 --- a/harbour/contrib/hbwin/win_prn2.c +++ b/harbour/contrib/hbwin/win_prn2.c @@ -139,7 +139,9 @@ static void hb_GetDefaultPrinter( PHB_ITEM pPrinterName ) if( hWinSpool ) { fnGetDefaultPrinter = ( DEFPRINTER ) GetProcAddress( hWinSpool, -#if defined( UNICODE ) +#if defined( HB_OS_WIN_CE ) + TEXT( "GetDefaultPrinterW" ) ); +#elif defined( UNICODE ) "GetDefaultPrinterW" ); #else "GetDefaultPrinterA" ); diff --git a/harbour/contrib/hbwin/win_prn3.c b/harbour/contrib/hbwin/win_prn3.c index 5a136b92c3..056941cda6 100644 --- a/harbour/contrib/hbwin/win_prn3.c +++ b/harbour/contrib/hbwin/win_prn3.c @@ -168,7 +168,9 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName ) if( ! hWinSpool ) return HB_FALSE; fnSetDefaultPrinter = ( DEFPRINTER ) GetProcAddress( hWinSpool, -#if defined( UNICODE ) +#if defined( HB_OS_WIN_CE ) + TEXT( "SetDefaultPrinterW" ) ); +#elif defined( UNICODE ) "SetDefaultPrinterW" ); #else "SetDefaultPrinterA" ); diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg index 250d0d0043..80c5d733ad 100644 --- a/harbour/contrib/hbwin/win_tprn.prg +++ b/harbour/contrib/hbwin/win_tprn.prg @@ -216,7 +216,7 @@ CREATE CLASS WIN_PRN ENDCLASS METHOD New( cPrinter ) CLASS WIN_PRN - ::PrinterName := iif( Empty( cPrinter ), GetDefaultPrinter(), cPrinter ) + ::PrinterName := iif( Empty( cPrinter ), win_PrinterGetDefault(), cPrinter ) /* Initialized with the current properties of the printer [jarabal] */ ::GetDocumentProperties() RETURN Self