diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7a00b6344b..e11987fa16 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-06 15:54 UTC+0200 Viktor Szakats (vszakats syenar.net) + * extras/gtwvw/tests/prog2.prg + * extras/gtwvw/tests/wvwtest9.prg + * src/debug/debugger.prg + * src/rtl/tgetlist.prg + * tests/sbartest.prg + * tests/tb1.prg + ! further cases of object vars called as methods, though + these didn't (necessarily) caused errors. + I wish Harbour had a native core OOP engine to catch + all (there are more cases than above) this mess at + compile-time. + 2012-10-06 15:26 UTC+0200 Viktor Szakats (harbour syenar.net) * src/rtl/browse.prg ! fixed not appending a new record when pressing K_DOWN diff --git a/harbour/extras/gtwvw/tests/prog2.prg b/harbour/extras/gtwvw/tests/prog2.prg index 5a3d7944ab..10d8b4e956 100644 --- a/harbour/extras/gtwvw/tests/prog2.prg +++ b/harbour/extras/gtwvw/tests/prog2.prg @@ -175,7 +175,7 @@ FUNCTION xBrowse1() aColumnsSep := Array( oBrowse:colCount ) FOR EACH tmp IN aColumnsSep - tmp := oBrowse:getColumn( tmp:__enumIndex() ):colSep() + tmp := oBrowse:getColumn( tmp:__enumIndex() ):colSep NEXT AddMiscObjects( nWin, {| nWindow | WVW_DrawBoxRecessed( nWindow, nTop + 1, nLeft + 1, nBottom - 1, nRight - 1 ) } ) diff --git a/harbour/extras/gtwvw/tests/wvwtest9.prg b/harbour/extras/gtwvw/tests/wvwtest9.prg index aa3050b2af..d72ef6218c 100644 --- a/harbour/extras/gtwvw/tests/wvwtest9.prg +++ b/harbour/extras/gtwvw/tests/wvwtest9.prg @@ -566,7 +566,7 @@ FUNCTION DEMO_Browse() aColumnsSep := Array( oBrowse:colCount ) FOR EACH tmp IN aColumnsSep - tmp := oBrowse:getColumn( tmp:__enumIndex() ):colSep() + tmp := oBrowse:getColumn( tmp:__enumIndex() ):colSep NEXT AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxRecessed( nWindow, oBrowse:nTop, oBrowse:nLeft, oBrowse:nBottom, oBrowse:nRight ) } ) @@ -612,7 +612,7 @@ FUNCTION DEMO_Browse() oBrowse:Left() CASE nKey == K_RIGHT - IF oBrowse:colPos == oBrowse:colCount(); loop; ENDIF + IF oBrowse:colPos == oBrowse:colCount; loop; ENDIF oBrowse:Right() CASE nKey == K_PGDN @@ -740,13 +740,13 @@ FUNCTION HXBscroller( oBrowse, nWinNum, XBid, XBmsg ) IF oBrowse:colPos == 1; exit; ENDIF oBrowse:Left() CASE XBmsg == 1 //SB_LINERIGHT - IF oBrowse:colpos == oBrowse:colCount(); exit; ENDIF + IF oBrowse:colpos == oBrowse:colCount; exit; ENDIF oBrowse:Right() CASE XBmsg == 2 //SB_PAGELEFT IF oBrowse:colPos == 1; exit; ENDIF oBrowse:panleft() CASE XBmsg == 3 //SB_PAGERIGHT - IF oBrowse:colpos == oBrowse:colCount(); exit; ENDIF + IF oBrowse:colpos == oBrowse:colCount; exit; ENDIF oBrowse:panright() OTHERWISE // ignore @@ -784,7 +784,7 @@ STATIC FUNCTION RefreshVXB( oBrowse, nWinNum, XBid ) nRatio := 1 nMin := 1 nMax := ordKeyCount() - nPage := oBrowse:RowCount() // ordKeyCount() + nPage := oBrowse:RowCount // ordKeyCount() nPos := ordKeyNo() - oBrowse:RowPos + 1 // ordKeyCount() ELSE nRatio := ordKeyCount() / 10 @@ -794,7 +794,7 @@ STATIC FUNCTION RefreshVXB( oBrowse, nWinNum, XBid ) nMin := 1 nMax := Round( ordKeyCount() / nRatio, 0 ) - nPage := Round( oBrowse:RowCount() / nRatio, 0 ) // ordKeyCount() + nPage := Round( oBrowse:RowCount / nRatio, 0 ) // ordKeyCount() nPos := Round( ( ordKeyNo() - oBrowse:RowPos + 1 ) / nRatio, 0 )// ordKeyCount() ENDIF diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg index e241fd455a..65b94ec545 100644 --- a/harbour/src/debug/debugger.prg +++ b/harbour/src/debug/debugger.prg @@ -2710,8 +2710,8 @@ METHOD Step() CLASS HBDebugger METHOD ToCursor() CLASS HBDebugger - IF ::IsValidStopLine( strip_path( ::cPrgName ), ::oBrwText:RowPos() ) - __dbgSetToCursor( ::pInfo, strip_path( ::cPrgName ), ::oBrwText:RowPos() ) + IF ::IsValidStopLine( strip_path( ::cPrgName ), ::oBrwText:RowPos ) + __dbgSetToCursor( ::pInfo, strip_path( ::cPrgName ), ::oBrwText:RowPos ) ::RestoreAppScreen() ::RestoreAppState() ::Exit() @@ -2734,7 +2734,7 @@ METHOD ToggleBreakPoint( nLine, cFileName ) CLASS HBDebugger IF nLine == NIL cFileName := strip_path( ::cPrgName ) - nLine := ::oBrwText:RowPos() + nLine := ::oBrwText:RowPos ENDIF IF !::IsValidStopLine( cFileName, nLine ) diff --git a/harbour/src/rtl/tgetlist.prg b/harbour/src/rtl/tgetlist.prg index bcef4f5b6a..dfd4bde8a0 100644 --- a/harbour/src/rtl/tgetlist.prg +++ b/harbour/src/rtl/tgetlist.prg @@ -1256,7 +1256,7 @@ METHOD TBApplyKey( oGet, oTB, nKey, oMenu, aMsg ) CLASS HBGetList CASE K_ENTER #ifndef HB_CLP_STRICT - IF !oTb:Stable() + IF ! oTb:Stable oTb:ForceStable() ENDIF #endif diff --git a/harbour/tests/sbartest.prg b/harbour/tests/sbartest.prg index 1c6b63023d..d07bf6faea 100644 --- a/harbour/tests/sbartest.prg +++ b/harbour/tests/sbartest.prg @@ -58,7 +58,7 @@ FUNCTION InitScrlBar() filesScroll:total := Len( aFileList ) - filesScroll:colorSpec( "W+/W, W+/W" ) + filesScroll:colorSpec := "W+/W, W+/W" SET COLOR TO "N/W*, W+/B,,,W/N" filesScroll:display() diff --git a/harbour/tests/tb1.prg b/harbour/tests/tb1.prg index a80e344570..c7035a9652 100644 --- a/harbour/tests/tb1.prg +++ b/harbour/tests/tb1.prg @@ -80,7 +80,7 @@ PROCEDURE Main() DispOutAt( nBottom - 2, nLeft, _DRAW_1, cColor ) DispOutAt( nBottom - 2, nRight, _DRAW_2, cColor ) - oBrw:colorSpec( cColor ) + oBrw:colorSpec := cColor oBrw:headSep := _DRAW_3 oBrw:footSep := _DRAW_4 oBrw:colSep := _DRAW_5