From 1d7c1fa33a6ac3b97fa4f9c02515ecfa2f11e0d9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Apr 2012 00:41:37 +0000 Subject: [PATCH] 2012-04-10 02:41 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/wvgclass.prg * contrib/gtwvg/wvgpaint.prg ! renamed public functions without namespace. INCOMPATIBLE. SetPaint() -> wvg_SetPaint() GetPaint() -> wvg_GetPaint() DelPaint() -> wvg_DelPaint() PurgePaint() -> wvg_PurgePaint() InsertPaint() -> wvg_InsertPaint() --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/gtwvg/wvgclass.prg | 6 +++--- harbour/contrib/gtwvg/wvgpaint.prg | 10 +++++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9a9cc652b6..cfc949d000 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-10 02:41 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/wvgclass.prg + * contrib/gtwvg/wvgpaint.prg + ! renamed public functions without namespace. INCOMPATIBLE. + SetPaint() -> wvg_SetPaint() + GetPaint() -> wvg_GetPaint() + DelPaint() -> wvg_DelPaint() + PurgePaint() -> wvg_PurgePaint() + InsertPaint() -> wvg_InsertPaint() + 2012-04-09 21:33 UTC+0200 Viktor Szakats (harbour syenar.net) * src/rtl/fscopy.c + using hb_file*() API instead of hb_fs*() API. diff --git a/harbour/contrib/gtwvg/wvgclass.prg b/harbour/contrib/gtwvg/wvgclass.prg index 6805c5cd64..917665c85f 100644 --- a/harbour/contrib/gtwvg/wvgclass.prg +++ b/harbour/contrib/gtwvg/wvgclass.prg @@ -295,12 +295,12 @@ METHOD wvtDialog:Create() FOR i := 1 to len( ::aObjects ) IF !empty( ::aObjects[ i ]:aPaint ) FOR j := 1 to len( ::aObjects[ i ]:aPaint ) - SetPaint( ::cPaintBlockID, ::nPaintID++, ; + wvg_SetPaint( ::cPaintBlockID, ::nPaintID++, ; ::aObjects[ i ]:aPaint[ j,1 ], ::aObjects[ i ]:aPaint[ j,2 ] ) next ENDIF next - WvtSetPaint( GetPaint( ::cPaintBlockID ) ) + WvtSetPaint( wvg_GetPaint( ::cPaintBlockID ) ) IF ascan( ::aObjects, {|o| o:lTabStop } ) > 0 ::lTabStops := .t. @@ -349,7 +349,7 @@ METHOD wvtDialog:Destroy() SetKey( Wvt_SetMenuKeyEvent(), ::oldMenuBlock ) RestScreen( 0, 0, maxrow(), maxcol(), ::cScreen ) Wvt_RestScreen( 0, 0 ,maxrow(), maxcol(), ::aWvtScreen ) - PurgePaint( ::cPaintBlockID ) + wvg_PurgePaint( ::cPaintBlockID ) WvtSetPaint( ::aOldPnt ) Wvt_SetGui( ::lGui ) diff --git a/harbour/contrib/gtwvg/wvgpaint.prg b/harbour/contrib/gtwvg/wvgpaint.prg index 4188b9e84f..0c81d4dc42 100644 --- a/harbour/contrib/gtwvg/wvgpaint.prg +++ b/harbour/contrib/gtwvg/wvgpaint.prg @@ -160,7 +160,7 @@ function WvtSetPaint( a_ ) /*----------------------------------------------------------------------*/ -function SetPaint( cID, nAction, xData, aAttr ) +function wvg_SetPaint( cID, nAction, xData, aAttr ) local n, n1, oldData if xData <> nil @@ -183,7 +183,7 @@ function SetPaint( cID, nAction, xData, aAttr ) /*----------------------------------------------------------------------*/ -function GetPaint( cID ) +function wvg_GetPaint( cID ) local n if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 @@ -194,7 +194,7 @@ function GetPaint( cID ) /*----------------------------------------------------------------------*/ -function DelPaint( cID, nAction ) +function wvg_DelPaint( cID, nAction ) local xData, n1, n if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 @@ -208,7 +208,7 @@ function DelPaint( cID, nAction ) /*----------------------------------------------------------------------*/ -function PurgePaint( cID,lDummy ) +function wvg_PurgePaint( cID,lDummy ) local n, aPaint DEFAULT lDummy TO .f. @@ -227,7 +227,7 @@ function PurgePaint( cID,lDummy ) /*----------------------------------------------------------------------*/ -function InsertPaint( cID, aPaint, lSet ) +function wvg_InsertPaint( cID, aPaint, lSet ) local n DEFAULT lSet TO .f.