diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f48065e489..d585d2f047 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-09 22:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/gtwvg/gtwvg.hbp + * sorted + + * contrib/gtwvg/wvgmle.prg + * contrib/gtwvg/wvgtreev.prg + * contrib/gtwvg/wvgcrt.prg + * contrib/gtwvg/wvgdatar.prg + * contrib/gtwvg/wvgsysw.prg + * contrib/gtwvg/wvgmenub.prg + * contrib/gtwvg/wvgphdlr.prg + * contrib/gtwvg/wvgstatc.prg + * contrib/hbnf/acctadj.prg + * contrib/hbnf/month.prg + * contrib/hbnf/ftint86.ch + * contrib/hbide/idethemes.prg + * contrib/hbide/idetags.prg + ! IF() -> IIF() + 2011-05-09 21:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/Makefile + include/hbstrict.ch diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp index cacef65a0d..cc31bf60a6 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbp +++ b/harbour/contrib/gtwvg/gtwvg.hbp @@ -22,36 +22,36 @@ gtwvg.c wvgcore.c +wvgcuig.c +wvggui.c wvgutils.c wvgwin.c wvgwing.c -wvggui.c -wvgcuig.c +wvg3stat.prg +wvgax.prg +wvgbitmp.prg +wvgcheck.prg wvgclass.prg +wvgcombo.prg +wvgcrt.prg +wvgdarea.prg +wvgdatar.prg +wvgdlg.prg +wvghtmlv.prg +wvglistb.prg +wvgmenub.prg +wvgmle.prg wvgpaint.prg wvgphdlr.prg -wvgwnd.prg -wvgcrt.prg -wvgax.prg -wvgdlg.prg -wvgmenub.prg -wvgtoolb.prg -wvgcombo.prg -wvglistb.prg wvgpushb.prg +wvgradio.prg +wvgscrlb.prg +wvgsle.prg wvgstatb.prg wvgstatc.prg -wvgtreev.prg -wvgcheck.prg -wvgdatar.prg -wvgradio.prg -wvg3stat.prg -wvgbitmp.prg -wvgsle.prg -wvgmle.prg -wvghtmlv.prg wvgsysw.prg -wvgdarea.prg -wvgscrlb.prg wvgtabpg.prg +wvgtoolb.prg +wvgtreev.prg +wvgwnd.prg diff --git a/harbour/contrib/gtwvg/wvgcrt.prg b/harbour/contrib/gtwvg/wvgcrt.prg index da7c04d61f..29db0b18bf 100644 --- a/harbour/contrib/gtwvg/wvgcrt.prg +++ b/harbour/contrib/gtwvg/wvgcrt.prg @@ -340,7 +340,7 @@ METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) Hb_GtInfo( HB_GTI_CLOSABLE , ::closable ) hb_gtInfo( HB_GTI_WINTITLE , ::title ) - hb_gtInfo( HB_GTI_RESIZEMODE, if( ::resizeMode == HB_GTI_RESIZEMODE_ROWS, HB_GTI_RESIZEMODE_ROWS, HB_GTI_RESIZEMODE_FONT ) ) + hb_gtInfo( HB_GTI_RESIZEMODE, iif( ::resizeMode == HB_GTI_RESIZEMODE_ROWS, HB_GTI_RESIZEMODE_ROWS, HB_GTI_RESIZEMODE_FONT ) ) IF ::lModal diff --git a/harbour/contrib/gtwvg/wvgdatar.prg b/harbour/contrib/gtwvg/wvgdatar.prg index ed061aef5f..80abd5b25a 100644 --- a/harbour/contrib/gtwvg/wvgdatar.prg +++ b/harbour/contrib/gtwvg/wvgdatar.prg @@ -145,7 +145,7 @@ METHOD setData( xValue, mp2 ) CLASS DataRef DO CASE CASE ::className == "BUTTON" /* CheckBox, Radio, 3State */ - ::sendMessage( BM_SETCHECK, IF( ::sl_editBuffer, BST_CHECKED, BST_UNCHECKED ), 0 ) + ::sendMessage( BM_SETCHECK, iif( ::sl_editBuffer, BST_CHECKED, BST_UNCHECKED ), 0 ) CASE ::className == "LISTBOX" /* Single Selection */ IF !empty( ::sl_editBuffer ) diff --git a/harbour/contrib/gtwvg/wvgmenub.prg b/harbour/contrib/gtwvg/wvgmenub.prg index 44aa678e63..52aabaa056 100644 --- a/harbour/contrib/gtwvg/wvgmenub.prg +++ b/harbour/contrib/gtwvg/wvgmenub.prg @@ -298,7 +298,7 @@ METHOD WvgMenuBar:addItem( aItem, p2, p3, p4 ) exit case "O" - cCaption := IF( bAction == NIL, xCaption:title, bAction ) + cCaption := iif( bAction == NIL, xCaption:title, bAction ) aItem := { MF_POPUP , xCaption:hMenu , cCaption, xCaption } exit @@ -377,7 +377,7 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) DEFAULT lCheck TO .T. IF !empty( ::hMenu ) .AND. !empty( nItemNum ) - nRet := WVG_CheckMenuItem( ::hMenu, nItemNum, MF_BYPOSITION + IF( lCheck, MF_CHECKED, MF_UNCHECKED ) ) + nRet := WVG_CheckMenuItem( ::hMenu, nItemNum, MF_BYPOSITION + iif( lCheck, MF_CHECKED, MF_UNCHECKED ) ) ENDIF RETURN IIF( nRet == -1, .F., .T. ) diff --git a/harbour/contrib/gtwvg/wvgmle.prg b/harbour/contrib/gtwvg/wvgmle.prg index a8f4800e16..e83f976976 100644 --- a/harbour/contrib/gtwvg/wvgmle.prg +++ b/harbour/contrib/gtwvg/wvgmle.prg @@ -116,7 +116,7 @@ CLASS WvgMLE INHERIT WvgWindow, DataRef METHOD pos() VIRTUAL DATA sl_undo INIT .T. - ACCESS undo INLINE IF( ::sl_undo, NIL, NIL ) + ACCESS undo INLINE iif( ::sl_undo, NIL, NIL ) ASSIGN undo( lUndo ) INLINE ::sl_undo := lUndo METHOD setEditable() VIRTUAL diff --git a/harbour/contrib/gtwvg/wvgphdlr.prg b/harbour/contrib/gtwvg/wvgphdlr.prg index 2c9d353dda..ca9ffa908a 100644 --- a/harbour/contrib/gtwvg/wvgphdlr.prg +++ b/harbour/contrib/gtwvg/wvgphdlr.prg @@ -254,7 +254,7 @@ METHOD notifier( nEvent, xParams ) CLASS WvgPartHandler elseif xParams[ 1 ] == WM_MOUSELEAVE /* Nothing */ else - aPos := if( ::mouseMode == 2, { xParams[ 3 ], xParams[ 4 ] }, { xParams[ 5 ], xParams[ 6 ] } ) + aPos := iif( ::mouseMode == 2, { xParams[ 3 ], xParams[ 4 ] }, { xParams[ 5 ], xParams[ 6 ] } ) ENDIF SWITCH xParams[ 1 ] diff --git a/harbour/contrib/gtwvg/wvgstatc.prg b/harbour/contrib/gtwvg/wvgstatc.prg index 3bba2e50d8..daf3834815 100644 --- a/harbour/contrib/gtwvg/wvgstatc.prg +++ b/harbour/contrib/gtwvg/wvgstatc.prg @@ -313,7 +313,7 @@ METHOD setCaption( xCaption, cDll ) WVG_DeleteObject( ::hBitmap ) ENDIF - ::hBitmap := WVG_LoadImage( ::caption, IF( hb_isNUmeric( ::caption ), 1, 2 ) ) + ::hBitmap := WVG_LoadImage( ::caption, iif( hb_isNUmeric( ::caption ), 1, 2 ) ) WVG_SendMessage( ::hWnd, STM_SETIMAGE, IMAGE_BITMAP, ::hBitmap ) diff --git a/harbour/contrib/gtwvg/wvgsysw.prg b/harbour/contrib/gtwvg/wvgsysw.prg index 1da54b1b5e..486f73c0a8 100644 --- a/harbour/contrib/gtwvg/wvgsysw.prg +++ b/harbour/contrib/gtwvg/wvgsysw.prg @@ -467,8 +467,8 @@ METHOD GetWvgFont( aFont ) CLASS WvgFontDialog oWvgFont:underscore := aFont[ 6 ] oWvgFont:strikeOut := aFont[ 7 ] oWvgFont:codePage := aFont[ 8 ] - oWvgFont:setCompoundName( trim( aFont[ 1 ] +" "+ IF( oWvgFont:bold, "Bold ", "" ) + ; - IF( oWvgFont:italic, "Italic", "" ) ) ) + oWvgFont:setCompoundName( trim( aFont[ 1 ] +" "+ iif( oWvgFont:bold, "Bold ", "" ) + ; + iif( oWvgFont:italic, "Italic", "" ) ) ) oWvgFont:create() RETURN oWvgFont @@ -601,7 +601,7 @@ METHOD createFont() CLASS WvgFont ::aFontInfo[ 1 ] := ::familyName ::aFontInfo[ 2 ] := ::height ::aFontInfo[ 3 ] := ::width - ::aFontInfo[ 4 ] := IF( ::bold, FW_BOLD, 0 ) + ::aFontInfo[ 4 ] := iif( ::bold, FW_BOLD, 0 ) ::aFontInfo[ 5 ] := ::italic ::aFontInfo[ 6 ] := ::underscore ::aFontInfo[ 7 ] := ::strikeout diff --git a/harbour/contrib/gtwvg/wvgtreev.prg b/harbour/contrib/gtwvg/wvgtreev.prg index 1a4f71570d..2e5dc19222 100644 --- a/harbour/contrib/gtwvg/wvgtreev.prg +++ b/harbour/contrib/gtwvg/wvgtreev.prg @@ -123,7 +123,7 @@ CLASS WvgTreeView INHERIT WvgWindow, DataRef METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, nRGB ) METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB ) METHOD showExpanded( lExpanded, nLevels ) INLINE Wvg_TreeView_ShowExpanded( ::hWnd, ; - IF( hb_isNil( lExpanded ), .f., lExpanded ), nLevels ) + iif( hb_isNil( lExpanded ), .f., lExpanded ), nLevels ) ENDCLASS @@ -331,7 +331,7 @@ CLASS WvgTreeViewItem METHOD destroy() METHOD expand( lExpand ) INLINE WVG_TreeView_Expand( ::hTree, ::hItem, ; - IF( hb_isLogical( lExpand ), lExpand, .t. ) ) + iif( hb_isLogical( lExpand ), lExpand, .t. ) ) METHOD isExpanded() METHOD setCaption( cCaption ) METHOD setExpandedImage( nResIdoBitmap ) @@ -418,7 +418,7 @@ METHOD addItem( cCaption ) CLASS WvgTreeViewItem oItem:caption := cCaption oItem:oWnd := ::oWnd - hParent := if( hb_isObject( oItem:oParent ), oItem:oParent:hItem, NIL ) + hParent := iif( hb_isObject( oItem:oParent ), oItem:oParent:hItem, NIL ) oItem:hItem := Wvg_TreeView_AddItem( oItem:hTree, hParent, oItem:caption ) diff --git a/harbour/contrib/hbide/idetags.prg b/harbour/contrib/hbide/idetags.prg index 7dcc2ae4f5..af32bf7ed7 100644 --- a/harbour/contrib/hbide/idetags.prg +++ b/harbour/contrib/hbide/idetags.prg @@ -169,7 +169,7 @@ FUNCTION UpdateTags( cModule, aSummary, aSumData, aFuncList, aLines, aText ) IF !aSumData[ i,1 ] // not commented out ! aAdd( aTags, { Upper( Trim( cName ) ) ,; - IF( cType = "METH", IF( !Empty( cClassName ), cClassName + ":" + Upper( cType ), Upper( cType ) ), Upper( cType ) ),; + iif( cType = "METH", iif( !Empty( cClassName ), cClassName + ":" + Upper( cType ), Upper( cType ) ), Upper( cType ) ),; aSumData[ i,2 ],; cModule ,; cSyntax ,; @@ -344,7 +344,7 @@ FUNCTION CheckComments( aText ) FOR i := nLine TO nLines - nState := if( lInComment, 1, 0 ) + nState := iif( lInComment, 1, 0 ) lChanged := .F. cText := aText[ i ] @@ -409,7 +409,7 @@ FUNCTION CheckComments( aText ) ENDDO ENDIF - cComments := substr( cComments, 1, i-1 ) + chr( nState + ( If( lInComment, 2, 0 ) + If( lChanged, 4, 0 ) ) ) + substr( cComments, i+1 ) + cComments := substr( cComments, 1, i-1 ) + chr( nState + ( iif( lInComment, 2, 0 ) + iif( lChanged, 4, 0 ) ) ) + substr( cComments, i+1 ) IF nState == 0 .AND. lLineComment lInComment := .F. ENDIF @@ -444,4 +444,3 @@ STATIC FUNCTION IsInString( cText, nPos, nStart, cQuote ) RETURN ( lInString ) /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbide/idethemes.prg b/harbour/contrib/hbide/idethemes.prg index 69f16404a1..dd7fb7a039 100644 --- a/harbour/contrib/hbide/idethemes.prg +++ b/harbour/contrib/hbide/idethemes.prg @@ -935,9 +935,9 @@ STATIC FUNCTION Attr2Str( a_ ) RETURN padl( hb_ntos( a_[ 1 ] ), 4 ) + "," +; padl( hb_ntos( a_[ 2 ] ), 4 ) + "," +; padl( hb_ntos( a_[ 3 ] ), 4 ) + "," +; - IF( a_[ 4 ], " Yes", " No" ) + "," +; - IF( a_[ 5 ], " Yes", " No" ) + "," +; - IF( a_[ 6 ], " Yes", " No" ) + "," + iif( a_[ 4 ], " Yes", " No" ) + "," +; + iif( a_[ 5 ], " Yes", " No" ) + "," +; + iif( a_[ 6 ], " Yes", " No" ) + "," /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbnf/acctadj.prg b/harbour/contrib/hbnf/acctadj.prg index f791fe5670..4f4e51997d 100644 --- a/harbour/contrib/hbnf/acctadj.prg +++ b/harbour/contrib/hbnf/acctadj.prg @@ -42,7 +42,7 @@ FUNCTION FT_ACCTADJ(dGivenDate, lIsEnd) lIsEnd := VALTYPE(lIsEnd) == "L" nTemp := FT_DAYTOBOW(dGivenDate) - IF nTemp > ( 2 + IF(!lIsEnd, 1, 0) ) + IF nTemp > ( 2 + iif(!lIsEnd, 1, 0) ) dGivenDate += ( 7 - nTemp ) // Next Week Start (This Week End + 1) ELSE dGivenDate -= nTemp // This Week Start (Prior Week End + 1) diff --git a/harbour/contrib/hbnf/ftint86.ch b/harbour/contrib/hbnf/ftint86.ch index f105c011e1..2e6dd20c30 100644 --- a/harbour/contrib/hbnf/ftint86.ch +++ b/harbour/contrib/hbnf/ftint86.ch @@ -70,8 +70,8 @@ #translate makehi( ) => (() * 256) #translate REG_DS => .T. #translate REG_ES => .F. -#translate highbyte( ) => ( int( if( () \< 0, 65536 + (), () ) / 256 ) ) -#translate lowbyte( ) => ( if( () \< 0, 65536 + (), () ) % 256 ) +#translate highbyte( ) => ( int( iif( () \< 0, 65536 + (), () ) / 256 ) ) +#translate lowbyte( ) => ( iif( () \< 0, 65536 + (), () ) % 256 ) #translate carrySet( ) => (ft_isbiton((), FLAG_CARRY)) #endif // __FTINT86_CH__ diff --git a/harbour/contrib/hbnf/month.prg b/harbour/contrib/hbnf/month.prg index f925eae209..95be7bfef2 100644 --- a/harbour/contrib/hbnf/month.prg +++ b/harbour/contrib/hbnf/month.prg @@ -48,7 +48,7 @@ LOCAL lIsMonth, nTemp, aRetVal ENDIF nTemp := MONTH( dGivenDate ) - MONTH( aRetVal[2] ) - nTemp += IF(nTemp >= 0, 1, 13) + nTemp += iif(nTemp >= 0, 1, 13) aRetVal[1] += PADL(LTRIM(STR(nTemp, 2)), 2, '0') aRetVal[2] := FT_MADD( aRetVal[2], nTemp - 1 )