diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 927bd195b3..8161ce0823 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-02-02 10:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/gtwvg/wvgcrt.prg + * contrib/gtwvg/wvgwnd.prg + * contrib/hbxbp/xbpcrt.prg + * contrib/hbxbp/xbpwindow.prg + * Fixed: ::sSize => ::aSize. + Overlook reported by Miso Pucko on bug-tracker. + + * Moved: some methods to PROTECTED: section. + * Fixed: ::isParentCrt() which was preventing the subclassing WvgCRT(). + Requested by Miso Pucko on bug-tracker. + 2012-02-02 10:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideprojmanager.prg * Formatting. diff --git a/harbour/contrib/gtwvg/wvgcrt.prg b/harbour/contrib/gtwvg/wvgcrt.prg index 49dc6654a0..8ea594877e 100644 --- a/harbour/contrib/gtwvg/wvgcrt.prg +++ b/harbour/contrib/gtwvg/wvgcrt.prg @@ -368,7 +368,7 @@ METHOD WvgCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) DEFAULT oParent TO ::oParent DEFAULT oOwner TO ::oOwner DEFAULT aPos TO ::aPos - DEFAULT aSize TO ::sSize + DEFAULT aSize TO ::aSize DEFAULT aPresParams TO ::aPresParams DEFAULT lVisible TO ::visible diff --git a/harbour/contrib/gtwvg/wvgwnd.prg b/harbour/contrib/gtwvg/wvgwnd.prg index b8079dd0d0..ed4aedb7fe 100644 --- a/harbour/contrib/gtwvg/wvgwnd.prg +++ b/harbour/contrib/gtwvg/wvgwnd.prg @@ -263,8 +263,9 @@ CLASS WvgWindow INHERIT WvgPartHandler METHOD dragMotion( xParam ) SETGET METHOD dragLeave( xParam ) SETGET METHOD dragDrop( xParam, xParam1 ) SETGET +PROTECTED: METHOD getPosAndSize( aPs, aSz ) - METHOD isParentCrt() INLINE ( __objGetClsName( ::oParent ) == "WVGCRT" ) + METHOD isParentCrt() INLINE ( ::oParent:objType == objTypeCrt ) METHOD rePosition() METHOD createControl() @@ -327,7 +328,7 @@ METHOD WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible DEFAULT oParent TO ::oParent DEFAULT oOwner TO ::oOwner DEFAULT aPos TO ::aPos - DEFAULT aSize TO ::sSize + DEFAULT aSize TO ::aSize DEFAULT aPresParams TO ::aPresParams DEFAULT lVisible TO ::visible diff --git a/harbour/contrib/hbxbp/xbpcrt.prg b/harbour/contrib/hbxbp/xbpcrt.prg index 1b5f44b9be..eb4bf5614b 100644 --- a/harbour/contrib/hbxbp/xbpcrt.prg +++ b/harbour/contrib/hbxbp/xbpcrt.prg @@ -319,9 +319,8 @@ METHOD XbpCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::lHasInputFocus := .t. ENDIF - ::nFlags := ::oWidget:windowFlags() - IF __objGetClsName( ::oParent ) == "XBPDRAWINGAREA" + IF __objGetClsName( ::oParent ) $ "XBPDRAWINGAREA" ::setParent( ::oParent ) ENDIF @@ -343,7 +342,7 @@ METHOD XbpCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) DEFAULT oParent TO ::oParent DEFAULT oOwner TO ::oOwner DEFAULT aPos TO ::aPos - DEFAULT aSize TO ::sSize + DEFAULT aSize TO ::aSize DEFAULT aPresParams TO ::aPresParams DEFAULT lVisible TO ::visible diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 79ae14a643..8c1469fdb5 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -389,7 +389,7 @@ METHOD XbpWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible DEFAULT oParent TO ::oParent DEFAULT oOwner TO ::oOwner DEFAULT aPos TO ::aPos - DEFAULT aSize TO ::sSize + DEFAULT aSize TO ::aSize DEFAULT aPresParams TO ::aPresParams DEFAULT lVisible TO ::visible