From 317fb99c320629e694dbf23830f88643f142dd2b Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 20 Apr 2008 11:25:52 +0000 Subject: [PATCH] 2008-04-20 13:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/tobject.prg ! fixed the problem with SET EXACT ON I introduced recently by mistake * harbour/contrib/xhb/txml.prg * harbour/contrib/hbw32/w32_tole.prg * harbour/contrib/hbw32/w32_tprn.prg * replaced some = use for assign or comparison with := or == when it will have the same meaning. Looks like some parts of TIP library will not work with SET EXACT ON and should be updated. --- harbour/ChangeLog | 12 ++++++++++++ harbour/contrib/hbw32/w32_tole.prg | 6 +++--- harbour/contrib/hbw32/w32_tprn.prg | 6 +++--- harbour/contrib/xhb/txml.prg | 6 +++--- harbour/source/rtl/tobject.prg | 2 +- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cc68baab05..92e20a7060 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-04-20 13:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/tobject.prg + ! fixed the problem with SET EXACT ON I introduced recently by mistake + + * harbour/contrib/xhb/txml.prg + * harbour/contrib/hbw32/w32_tole.prg + * harbour/contrib/hbw32/w32_tprn.prg + * replaced some = use for assign or comparison with := or == when + it will have the same meaning. + Looks like some parts of TIP library will not work with SET EXACT ON + and should be updated. + 2008-04-18 13:06 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/gtwvg/wvtcore.c ! fixed missing ; in last modification diff --git a/harbour/contrib/hbw32/w32_tole.prg b/harbour/contrib/hbw32/w32_tole.prg index 7700ce2424..7fa94dfd11 100644 --- a/harbour/contrib/hbw32/w32_tole.prg +++ b/harbour/contrib/hbw32/w32_tole.prg @@ -216,7 +216,7 @@ METHOD New( uObj, cClass ) CLASS TOleAuto RETURN HB_ExecFromArray( Self, "_New", HB_aParams() ) ENDIF - IF ValType( uObj ) = 'C' + IF ValType( uObj ) == 'C' ::hObj := CreateOleObject( uObj ) IF OleError() != 0 @@ -252,7 +252,7 @@ METHOD New( uObj, cClass ) CLASS TOleAuto ENDIF ::cClassName := uObj - ELSEIF ValType( uObj ) = 'N' + ELSEIF ValType( uObj ) == 'N' OleAddRef( uObj ) ::hObj := uObj @@ -298,7 +298,7 @@ METHOD GetActiveObject( cClass ) CLASS TOleAuto LOCAL oErr - IF ValType( cClass ) = 'C' + IF ValType( cClass ) == 'C' ::hObj := GetOleObject( cClass ) IF OleError() != 0 diff --git a/harbour/contrib/hbw32/w32_tprn.prg b/harbour/contrib/hbw32/w32_tprn.prg index 55e9df422a..67d05cf474 100644 --- a/harbour/contrib/hbw32/w32_tprn.prg +++ b/harbour/contrib/hbw32/w32_tprn.prg @@ -152,7 +152,7 @@ CLASS WIN32PRN METHOD StartDoc(cDocame) // Calls StartPage() METHOD EndDoc(lAbortDoc) // Calls EndPage() if lAbortDoc not .T. METHOD StartPage() - METHOD EndPage(lStartNewPage) // If lStartNewPage = .T. then StartPage() is called for the next page of output + METHOD EndPage(lStartNewPage) // If lStartNewPage == .T. then StartPage() is called for the next page of output METHOD NewLine() METHOD NewPage() METHOD SetFont(cFontName, nPointSize, nWidth, nBold, lUnderline, lItalic, nCharSet) @@ -178,7 +178,7 @@ CLASS WIN32PRN ::TextColor:=nClrText, ::BkColor:=nClrPane, ::TextAlign:=nAlign,; win32_SetColor( ::hPrinterDC, nClrText, nClrPane, nAlign) ) - METHOD TextOut(cString, lNewLine, lUpdatePosX, nAlign) // nAlign : 0 = left, 1 = right, 2 = centered + METHOD TextOut(cString, lNewLine, lUpdatePosX, nAlign) // nAlign : 0 == left, 1 == right, 2 == centered METHOD TextOutAt(nPosX,nPosY, cString, lNewLine, lUpdatePosX, nAlign) // **WARNING** : (Col,Row) _NOT_ (Row,Col) @@ -212,7 +212,7 @@ CLASS WIN32PRN nWidth, nBold, lUnderLine, lItalic, lNewLine,; // in specified font and color. lUpdatePosX, nColor, nAlign ) // Restore original font and colour // after printing. - METHOD SetBkMode( nMode ) INLINE win32_SetBkMode( ::hPrinterDc, nMode ) // OPAQUE= 2 or TRANSPARENT= 1 + METHOD SetBkMode( nMode ) INLINE win32_SetBkMode( ::hPrinterDc, nMode ) // OPAQUE == 2 or TRANSPARENT == 1 // Set Background mode METHOD GetDeviceCaps( nCaps ) INLINE win32_GetDeviceCaps( ::hPrinterDC, nCaps) diff --git a/harbour/contrib/xhb/txml.prg b/harbour/contrib/xhb/txml.prg index 699c5c495a..875bc604e2 100644 --- a/harbour/contrib/xhb/txml.prg +++ b/harbour/contrib/xhb/txml.prg @@ -361,14 +361,14 @@ METHOD New( xElem, nStyle ) CLASS TXmlDocument ELSE SWITCH ValType( xElem ) CASE 'O' - ::oRoot = xElem - EXIT + ::oRoot := xElem + EXIT CASE 'N' CASE 'C' ::oRoot := TXmlNode():New( HBXML_TYPE_DOCUMENT ) ::Read( xElem, nStyle ) - END + ENDSWITCH ENDIF RETURN Self diff --git a/harbour/source/rtl/tobject.prg b/harbour/source/rtl/tobject.prg index 120b713c35..86e01bc967 100644 --- a/harbour/source/rtl/tobject.prg +++ b/harbour/source/rtl/tobject.prg @@ -100,7 +100,7 @@ FUNCTION HBObject() s_oClass:SetOnError( @HBObject_DftonError() ) - s_oClass:AddInline( "MSGNOTFOUND" , {| Self, cMsg | ::Error( "Message not found", __OBJGETCLSNAME( Self ), cMsg, IIF( cMsg="_", 1005, 1004 ) ) }, HB_OO_CLSTP_EXPORTED ) + s_oClass:AddInline( "MSGNOTFOUND" , {| Self, cMsg | ::Error( "Message not found", __OBJGETCLSNAME( Self ), cMsg, IIF( Left( cMsg, 1 ) == "_", 1005, 1004 ) ) }, HB_OO_CLSTP_EXPORTED ) /*s_oClass:AddMultiData(,,HB_OO_CLSTP_EXPORTED,{"CLASS"}, .F. )*/