fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-04-19 16:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbxbp/xbpparthandler.prg
    ! Changed: ::_aOwned => ::a_Owned to not generate error when
      class inheriting an XbpPart has a data member as ::aOwned.
This commit is contained in:
Pritpal Bedi
2011-04-19 23:47:10 +00:00
parent ef942cb657
commit 98035b58a1
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-19 16:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbxbp/xbpparthandler.prg
! Changed: ::_aOwned => ::a_Owned to not generate error when
class inheriting an XbpPart has a data member as ::aOwned.
2011-04-20 01:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* config/global.mk

14
harbour/contrib/hbxbp/xbpparthandler.prg
View File

@@ -100,7 +100,7 @@ CLASS XbpPartHandler
METHOD notifier()
DATA aChildren INIT {}
DATA _aOwned INIT {}
DATA a_Owned INIT {}
DATA nNameId
DATA oParent
DATA oOwner
@@ -209,7 +209,7 @@ METHOD XbpPartHandler:addAsChild()
METHOD XbpPartHandler:addAsOwned( oXbp )
IF ! empty( oXbp )
aadd( ::_aOwned, oXbp )
aadd( ::a_Owned, oXbp )
ENDIF
RETURN Self
@@ -252,10 +252,10 @@ METHOD XbpPartHandler:delChild( oXbp )
METHOD XbpPartHandler:delOwned( oXbp )
LOCAL n
IF ( n := ascan( ::_aOwned, {|o| o == oXbp } ) ) > 0
hb_adel( ::_aOwned, n, .t. )
IF empty( ::_aOwned )
::_aOwned := {}
IF ( n := ascan( ::a_Owned, {|o| o == oXbp } ) ) > 0
hb_adel( ::a_Owned, n, .t. )
IF empty( ::a_Owned )
::a_Owned := {}
ENDIF
endif
@@ -319,7 +319,7 @@ METHOD XbpPartHandler:notifier()
METHOD XbpPartHandler:moveOwned( nOffSetX, nOffSetY )
LOCAL oXbp, oPos
FOR EACH oXbp IN ::_aOwned
FOR EACH oXbp IN ::a_Owned
IF __objHasMsg( oXbp, "MOVEWITHOWNER" ) .AND. oXbp:moveWithOwner
IF !( oXbp:oParent:className() == "XBPDRAWINGAREA" )
oPos := oXbp:oWidget:pos()