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

2012-11-28 17:59 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/rtl/checkbox.prg
  * src/rtl/listbox.prg
  * src/rtl/pushbtn.prg
  * src/rtl/radiobtn.prg
  * src/rtl/radiogrp.prg
  * src/rtl/scrollbr.prg
  * src/rtl/tbcolumn.prg
  * src/rtl/tbrowse.prg
  * src/rtl/tget.prg
  * src/rtl/tmenuitm.prg
  * src/rtl/tpopup.prg
  * src/rtl/tpopuphb.prg
  * src/rtl/ttopbar.prg
    ! fixed case of class names
This commit is contained in:
Viktor Szakats
2012-11-28 17:01:53 +00:00
parent 81218a84ef
commit 6bf130b347
14 changed files with 422 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog.txt
View File

@@ -10,6 +10,22 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-28 17:59 UTC+0100 Viktor Szakats (harbour syenar.net)
* src/rtl/checkbox.prg
* src/rtl/listbox.prg
* src/rtl/pushbtn.prg
* src/rtl/radiobtn.prg
* src/rtl/radiogrp.prg
* src/rtl/scrollbr.prg
* src/rtl/tbcolumn.prg
* src/rtl/tbrowse.prg
* src/rtl/tget.prg
* src/rtl/tmenuitm.prg
* src/rtl/tpopup.prg
* src/rtl/tpopuphb.prg
* src/rtl/ttopbar.prg
! fixed case of class names
2012-11-28 17:38 UTC+0100 Viktor Szakats (harbour syenar.net)
* src/rtl/devoutp.prg
+ DEVOUTPICT() to support timestampe type

44
harbour/src/rtl/checkbox.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* CHECKBOX class
* CheckBox class
*
* Copyright 2000 Luiz Rafael Culik <culik@sl.conex.net>
* www - http://harbour-project.org
@@ -65,7 +65,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS CHECKBOX FUNCTION HBCheckBox
CREATE CLASS CheckBox FUNCTION HBCheckBox
EXPORTED:
@@ -114,7 +114,7 @@ CREATE CLASS CHECKBOX FUNCTION HBCheckBox
ENDCLASS
METHOD setFocus() CLASS CHECKBOX
METHOD setFocus() CLASS CheckBox
IF ! ::lHasFocus
::nCursor := SetCursor( SC_NONE )
@@ -128,7 +128,7 @@ METHOD setFocus() CLASS CHECKBOX
RETURN Self
METHOD select( lState ) CLASS CHECKBOX
METHOD select( lState ) CLASS CheckBox
LOCAL lOldState := ::lBuffer
@@ -144,7 +144,7 @@ METHOD select( lState ) CLASS CHECKBOX
RETURN Self
METHOD killFocus() CLASS CHECKBOX
METHOD killFocus() CLASS CheckBox
IF ::lHasFocus
::lHasFocus := .F.
@@ -160,7 +160,7 @@ METHOD killFocus() CLASS CHECKBOX
RETURN Self
METHOD hitTest( nMRow, nMCol ) CLASS CHECKBOX
METHOD hitTest( nMRow, nMCol ) CLASS CheckBox
LOCAL nPosAccel
LOCAL nLenCaption
@@ -186,7 +186,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS CHECKBOX
RETURN HTNOWHERE
METHOD display() CLASS CHECKBOX
METHOD display() CLASS CheckBox
LOCAL cColor
LOCAL cStyle := ::cStyle
@@ -228,7 +228,7 @@ METHOD display() CLASS CHECKBOX
RETURN Self
METHOD bitmaps( aBitmaps ) CLASS CHECKBOX
METHOD bitmaps( aBitmaps ) CLASS CheckBox
IF aBitmaps != NIL
::aBitmaps := __eInstVar53( Self, "BITMAPS", aBitmaps, "A", 1001 )
@@ -236,10 +236,10 @@ METHOD bitmaps( aBitmaps ) CLASS CHECKBOX
RETURN ::aBitmaps
METHOD buffer() CLASS CHECKBOX
METHOD buffer() CLASS CheckBox
RETURN ::lBuffer
METHOD capCol( nCapCol ) CLASS CHECKBOX
METHOD capCol( nCapCol ) CLASS CheckBox
IF nCapCol != NIL
::nCapCol := __eInstVar53( Self, "CAPCOL", nCapCol, "N", 1001 )
@@ -247,7 +247,7 @@ METHOD capCol( nCapCol ) CLASS CHECKBOX
RETURN ::nCapCol
METHOD capRow( nCapRow ) CLASS CHECKBOX
METHOD capRow( nCapRow ) CLASS CheckBox
IF nCapRow != NIL
::nCapRow := __eInstVar53( Self, "CAPROW", nCapRow, "N", 1001 )
@@ -255,7 +255,7 @@ METHOD capRow( nCapRow ) CLASS CHECKBOX
RETURN ::nCapRow
METHOD caption( cCaption ) CLASS CHECKBOX
METHOD caption( cCaption ) CLASS CheckBox
IF cCaption != NIL
::cCaption := __eInstVar53( Self, "CAPTION", cCaption, "C", 1001 )
@@ -263,7 +263,7 @@ METHOD caption( cCaption ) CLASS CHECKBOX
RETURN ::cCaption
METHOD col( nCol ) CLASS CHECKBOX
METHOD col( nCol ) CLASS CheckBox
IF nCol != NIL
::nCol := __eInstVar53( Self, "COL", nCol, "N", 1001 )
@@ -271,7 +271,7 @@ METHOD col( nCol ) CLASS CHECKBOX
RETURN ::nCol
METHOD colorSpec( cColorSpec ) CLASS CHECKBOX
METHOD colorSpec( cColorSpec ) CLASS CheckBox
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001, ;
@@ -280,7 +280,7 @@ METHOD colorSpec( cColorSpec ) CLASS CHECKBOX
RETURN ::cColorSpec
METHOD fBlock( bFBlock ) CLASS CHECKBOX
METHOD fBlock( bFBlock ) CLASS CheckBox
IF PCount() > 0
::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) )
@@ -288,10 +288,10 @@ METHOD fBlock( bFBlock ) CLASS CHECKBOX
RETURN ::bFBlock
METHOD hasFocus() CLASS CHECKBOX
METHOD hasFocus() CLASS CheckBox
RETURN ::lHasFocus
METHOD message( cMessage ) CLASS CHECKBOX
METHOD message( cMessage ) CLASS CheckBox
IF cMessage != NIL
::cMessage := __eInstVar53( Self, "MESSAGE", cMessage, "C", 1001 )
@@ -299,7 +299,7 @@ METHOD message( cMessage ) CLASS CHECKBOX
RETURN ::cMessage
METHOD row( nRow ) CLASS CHECKBOX
METHOD row( nRow ) CLASS CheckBox
IF nRow != NIL
::nRow := __eInstVar53( Self, "ROW", nRow, "N", 1001 )
@@ -307,7 +307,7 @@ METHOD row( nRow ) CLASS CHECKBOX
RETURN ::nRow
METHOD sBlock( bSBlock ) CLASS CHECKBOX
METHOD sBlock( bSBlock ) CLASS CheckBox
IF PCount() > 0
::bSBlock := iif( bSBlock == NIL, NIL, __eInstVar53( Self, "SBLOCK", bSBlock, "B", 1001 ) )
@@ -315,7 +315,7 @@ METHOD sBlock( bSBlock ) CLASS CHECKBOX
RETURN ::bSBlock
METHOD style( cStyle ) CLASS CHECKBOX
METHOD style( cStyle ) CLASS CheckBox
IF cStyle != NIL
::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 0 .OR. Len( cStyle ) == 4 } )
@@ -323,10 +323,10 @@ METHOD style( cStyle ) CLASS CHECKBOX
RETURN ::cStyle
METHOD typeOut() CLASS CHECKBOX
METHOD typeOut() CLASS CheckBox
RETURN .F.
METHOD New( nRow, nCol, cCaption ) CLASS CHECKBOX
METHOD New( nRow, nCol, cCaption ) CLASS CheckBox
LOCAL cColor

94
harbour/src/rtl/listbox.prg
View File

@@ -72,7 +72,7 @@
#define _LISTBOX_ITEMDATA( aItem ) iif( aItem[ _ITEM_cDATA ] == NIL, aItem[ _ITEM_cTEXT ], aItem[ _ITEM_cDATA ] )
CREATE CLASS LISTBOX FUNCTION HBListBox
CREATE CLASS ListBox FUNCTION HBListBox
EXPORTED:
@@ -164,7 +164,7 @@ CREATE CLASS LISTBOX FUNCTION HBListBox
ENDCLASS
METHOD addItem( cText, cData ) CLASS LISTBOX
METHOD addItem( cText, cData ) CLASS ListBox
IF HB_ISSTRING( cText ) .AND. ValType( cData ) $ "CU"
@@ -182,7 +182,7 @@ METHOD addItem( cText, cData ) CLASS LISTBOX
RETURN Self
METHOD close() CLASS LISTBOX
METHOD close() CLASS ListBox
IF ::lIsOpen
RestScreen( ::aSaveScr[ 1 ], ::aSaveScr[ 2 ], ::aSaveScr[ 3 ], ::aSaveScr[ 4 ], ::aSaveScr[ 5 ] )
@@ -224,7 +224,7 @@ METHOD delItem( nPos )
RETURN Self
METHOD display() CLASS LISTBOX
METHOD display() CLASS ListBox
LOCAL nItem
LOCAL nEnd
@@ -314,7 +314,7 @@ METHOD display() CLASS LISTBOX
RETURN Self
METHOD findText( cText, nPos, lCaseSensitive, lExact ) CLASS LISTBOX
METHOD findText( cText, nPos, lCaseSensitive, lExact ) CLASS ListBox
LOCAL nPosFound
LOCAL nLen
@@ -355,7 +355,7 @@ METHOD findText( cText, nPos, lCaseSensitive, lExact ) CLASS LISTBOX
RETURN nPosFound
METHOD findData( cData, nPos, lCaseSensitive, lExact ) CLASS LISTBOX
METHOD findData( cData, nPos, lCaseSensitive, lExact ) CLASS ListBox
LOCAL nPosFound
LOCAL nLen
@@ -396,16 +396,16 @@ METHOD findData( cData, nPos, lCaseSensitive, lExact ) CLASS LISTBOX
RETURN nPosFound
METHOD getData( nPos ) CLASS LISTBOX
METHOD getData( nPos ) CLASS ListBox
RETURN iif( nPos >= 1 .AND. nPos <= ::nItemCount, ::aItems[ nPos ][ _ITEM_cDATA ], NIL )
METHOD getItem( nPos ) CLASS LISTBOX
METHOD getItem( nPos ) CLASS ListBox
RETURN iif( nPos >= 1 .AND. nPos <= ::nItemCount, ::aItems[ nPos ], NIL )
METHOD getText( nPos ) CLASS LISTBOX
METHOD getText( nPos ) CLASS ListBox
RETURN iif( nPos >= 1 .AND. nPos <= ::nItemCount, ::aItems[ nPos ][ _ITEM_cTEXT ], NIL )
METHOD hitTest( nMRow, nMCol ) CLASS LISTBOX
METHOD hitTest( nMRow, nMCol ) CLASS ListBox
LOCAL nRet
LOCAL nTop
@@ -510,7 +510,7 @@ METHOD insItem( nPos, cText, cData )
RETURN Self
METHOD killFocus() CLASS LISTBOX
METHOD killFocus() CLASS ListBox
LOCAL nOldMCur
@@ -537,7 +537,7 @@ METHOD killFocus() CLASS LISTBOX
RETURN Self
METHOD nextItem() CLASS LISTBOX
METHOD nextItem() CLASS ListBox
LOCAL nOldValue
@@ -547,7 +547,7 @@ METHOD nextItem() CLASS LISTBOX
RETURN Self
METHOD open() CLASS LISTBOX
METHOD open() CLASS ListBox
IF ! ::lIsOpen
@@ -564,7 +564,7 @@ METHOD open() CLASS LISTBOX
RETURN Self
METHOD prevItem() CLASS LISTBOX
METHOD prevItem() CLASS ListBox
LOCAL nOldValue
@@ -579,7 +579,7 @@ METHOD prevItem() CLASS LISTBOX
RETURN Self
METHOD scroll( nMethod ) CLASS LISTBOX
METHOD scroll( nMethod ) CLASS ListBox
LOCAL nPos
LOCAL nTopItem
@@ -682,7 +682,7 @@ METHOD scroll( nMethod ) CLASS LISTBOX
RETURN Self
METHOD select( xPos ) CLASS LISTBOX
METHOD select( xPos ) CLASS ListBox
LOCAL nValue
LOCAL nPos
@@ -743,7 +743,7 @@ METHOD select( xPos ) CLASS LISTBOX
RETURN ::nValue
METHOD setData( nPos, cData ) CLASS LISTBOX
METHOD setData( nPos, cData ) CLASS ListBox
IF nPos >= 1 .AND. nPos <= ::nItemCount
::aItems[ nPos ][ _ITEM_cDATA ] := cData
@@ -751,7 +751,7 @@ METHOD setData( nPos, cData ) CLASS LISTBOX
RETURN Self
METHOD setFocus() CLASS LISTBOX
METHOD setFocus() CLASS ListBox
IF ! ::lHasFocus
@@ -768,7 +768,7 @@ METHOD setFocus() CLASS LISTBOX
RETURN Self
METHOD setItem( nPos, aItem ) CLASS LISTBOX
METHOD setItem( nPos, aItem ) CLASS ListBox
IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
Len( aItem ) == 2 .AND. ;
@@ -779,7 +779,7 @@ METHOD setItem( nPos, aItem ) CLASS LISTBOX
RETURN Self
METHOD setText( nPos, cText ) CLASS LISTBOX
METHOD setText( nPos, cText ) CLASS ListBox
IF nPos >= 1 .AND. nPos <= ::nItemCount
::aItems[ nPos ][ _ITEM_cTEXT ] := cText
@@ -789,7 +789,7 @@ METHOD setText( nPos, cText ) CLASS LISTBOX
/* -------------------------------------------- */
METHOD changeItem( nOldPos, nNewPos ) CLASS LISTBOX
METHOD changeItem( nOldPos, nNewPos ) CLASS ListBox
LOCAL nValue
@@ -830,7 +830,7 @@ METHOD changeItem( nOldPos, nNewPos ) CLASS LISTBOX
RETURN Self
METHOD scrollbarPos() CLASS LISTBOX
METHOD scrollbarPos() CLASS ListBox
LOCAL nSize := ::nBottom - ::nTop - iif( ::lDropDown, 2, 1 )
LOCAL nCount := ::nItemCount
@@ -840,7 +840,7 @@ METHOD scrollbarPos() CLASS LISTBOX
/* -------------------------------------------- */
METHOD bitmap( cBitmap ) CLASS LISTBOX
METHOD bitmap( cBitmap ) CLASS ListBox
IF cBitmap != NIL .AND. ::lDropDown
::cBitmap := __eInstVar53( Self, "BITMAP", cBitmap, "C", 1001 )
@@ -848,7 +848,7 @@ METHOD bitmap( cBitmap ) CLASS LISTBOX
RETURN ::cBitmap
METHOD bottom( nBottom ) CLASS LISTBOX
METHOD bottom( nBottom ) CLASS ListBox
IF nBottom != NIL
::nBottom := __eInstVar53( Self, "BOTTOM", nBottom, "N", 1001 )
@@ -859,10 +859,10 @@ METHOD bottom( nBottom ) CLASS LISTBOX
RETURN ::nBottom
METHOD buffer() CLASS LISTBOX
METHOD buffer() CLASS ListBox
RETURN ::xBuffer
METHOD capCol( nCapCol ) CLASS LISTBOX
METHOD capCol( nCapCol ) CLASS ListBox
IF nCapCol != NIL
::nCapCol := __eInstVar53( Self, "CAPCOL", nCapCol, "N", 1001 )
@@ -870,7 +870,7 @@ METHOD capCol( nCapCol ) CLASS LISTBOX
RETURN ::nCapCol
METHOD capRow( nCapRow ) CLASS LISTBOX
METHOD capRow( nCapRow ) CLASS ListBox
IF nCapRow != NIL
::nCapRow := __eInstVar53( Self, "CAPROW", nCapRow, "N", 1001 )
@@ -878,7 +878,7 @@ METHOD capRow( nCapRow ) CLASS LISTBOX
RETURN ::nCapRow
METHOD caption( cCaption ) CLASS LISTBOX
METHOD caption( cCaption ) CLASS ListBox
IF cCaption != NIL
::cCaption := __eInstVar53( Self, "CAPTION", cCaption, "C", 1001 )
@@ -890,7 +890,7 @@ METHOD caption( cCaption ) CLASS LISTBOX
RETURN ::cCaption
METHOD coldBox( cColdBox ) CLASS LISTBOX
METHOD coldBox( cColdBox ) CLASS ListBox
IF cColdBox != NIL
::cColdBox := __eInstVar53( Self, "COLDBOX", cColdBox, "C", 1001, {|| Len( cColdBox ) == 0 .OR. Len( cColdBox ) == 8 } )
@@ -898,7 +898,7 @@ METHOD coldBox( cColdBox ) CLASS LISTBOX
RETURN ::cColdBox
METHOD colorSpec( cColorSpec ) CLASS LISTBOX
METHOD colorSpec( cColorSpec ) CLASS ListBox
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001, ;
@@ -909,7 +909,7 @@ METHOD colorSpec( cColorSpec ) CLASS LISTBOX
RETURN ::cColorSpec
METHOD dropDown( lDropDown ) CLASS LISTBOX
METHOD dropDown( lDropDown ) CLASS ListBox
IF lDropDown != NIL
@@ -924,7 +924,7 @@ METHOD dropDown( lDropDown ) CLASS LISTBOX
RETURN ::lDropDown
METHOD fBlock( bFBlock ) CLASS LISTBOX
METHOD fBlock( bFBlock ) CLASS ListBox
IF PCount() > 0
::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) )
@@ -932,10 +932,10 @@ METHOD fBlock( bFBlock ) CLASS LISTBOX
RETURN ::bFBlock
METHOD hasFocus() CLASS LISTBOX
METHOD hasFocus() CLASS ListBox
RETURN ::lHasFocus
METHOD hotBox( cHotBox ) CLASS LISTBOX
METHOD hotBox( cHotBox ) CLASS ListBox
IF cHotBox != NIL
::cHotBox := __eInstVar53( Self, "HOTBOX", cHotBox, "C", 1001, {|| Len( cHotBox ) == 0 .OR. Len( cHotBox ) == 8 } )
@@ -943,13 +943,13 @@ METHOD hotBox( cHotBox ) CLASS LISTBOX
RETURN ::cHotBox
METHOD isOpen() CLASS LISTBOX
METHOD isOpen() CLASS ListBox
RETURN ::lIsOpen
METHOD itemCount() CLASS LISTBOX
METHOD itemCount() CLASS ListBox
RETURN ::nItemCount
METHOD left( nLeft ) CLASS LISTBOX
METHOD left( nLeft ) CLASS ListBox
IF nLeft != NIL
::nLeft := __eInstVar53( Self, "LEFT", nLeft, "N", 1001 )
@@ -957,7 +957,7 @@ METHOD left( nLeft ) CLASS LISTBOX
RETURN ::nLeft
METHOD message( cMessage ) CLASS LISTBOX
METHOD message( cMessage ) CLASS ListBox
IF cMessage != NIL
::cMessage := __eInstVar53( Self, "MESSAGE", cMessage, "C", 1001 )
@@ -965,7 +965,7 @@ METHOD message( cMessage ) CLASS LISTBOX
RETURN ::cMessage
METHOD right( nRight ) CLASS LISTBOX
METHOD right( nRight ) CLASS ListBox
IF nRight != NIL
::nRight := __eInstVar53( Self, "RIGHT", nRight, "N", 1001 )
@@ -976,7 +976,7 @@ METHOD right( nRight ) CLASS LISTBOX
RETURN ::nRight
METHOD sBlock( bSBlock ) CLASS LISTBOX
METHOD sBlock( bSBlock ) CLASS ListBox
IF PCount() > 0
::bSBlock := iif( bSBlock == NIL, NIL, __eInstVar53( Self, "SBLOCK", bSBlock, "B", 1001 ) )
@@ -984,7 +984,7 @@ METHOD sBlock( bSBlock ) CLASS LISTBOX
RETURN ::bSBlock
METHOD style( cStyle ) CLASS LISTBOX
METHOD style( cStyle ) CLASS ListBox
IF cStyle != NIL
::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 1 } )
@@ -992,10 +992,10 @@ METHOD style( cStyle ) CLASS LISTBOX
RETURN ::cStyle
METHOD textValue() CLASS LISTBOX
METHOD textValue() CLASS ListBox
RETURN ::cTextValue
METHOD top( nTop ) CLASS LISTBOX
METHOD top( nTop ) CLASS ListBox
IF nTop != NIL
::nTop := __eInstVar53( Self, "TOP", nTop, "N", 1001 )
@@ -1006,7 +1006,7 @@ METHOD top( nTop ) CLASS LISTBOX
RETURN ::nTop
METHOD topItem( nTopItem ) CLASS LISTBOX
METHOD topItem( nTopItem ) CLASS ListBox
IF nTopItem != NIL
@@ -1027,13 +1027,13 @@ METHOD topItem( nTopItem ) CLASS LISTBOX
RETURN ::nTopItem
METHOD typeOut() CLASS LISTBOX
METHOD typeOut() CLASS ListBox
RETURN ::nItemCount == 0
METHOD value() CLASS LISTBOX
METHOD value() CLASS ListBox
RETURN ::nValue
METHOD vScroll( oVScroll ) CLASS LISTBOX
METHOD vScroll( oVScroll ) CLASS ListBox
IF PCount() > 0
IF oVScroll == NIL

40
harbour/src/rtl/pushbtn.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* PUSHBUTTON class
* PushButton class
*
* Copyright 2000 Luiz Rafael Culik <culik@sl.conex.net>
* www - http://harbour-project.org
@@ -65,7 +65,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS PUSHBUTTON FUNCTION HBPushButton
CREATE CLASS PushButton FUNCTION HBPushButton
EXPORTED:
@@ -116,7 +116,7 @@ CREATE CLASS PUSHBUTTON FUNCTION HBPushButton
ENDCLASS
METHOD setFocus() CLASS PUSHBUTTON
METHOD setFocus() CLASS PushButton
IF ! ::lHasFocus
::lHasFocus := .T.
@@ -129,7 +129,7 @@ METHOD setFocus() CLASS PUSHBUTTON
RETURN Self
METHOD select( nPos ) CLASS PUSHBUTTON
METHOD select( nPos ) CLASS PushButton
LOCAL nCurPos := nPos
@@ -161,7 +161,7 @@ METHOD select( nPos ) CLASS PUSHBUTTON
RETURN Self
METHOD killFocus() CLASS PUSHBUTTON
METHOD killFocus() CLASS PushButton
IF ::lHasFocus
::lHasFocus := .F.
@@ -175,7 +175,7 @@ METHOD killFocus() CLASS PUSHBUTTON
RETURN Self
METHOD hitTest( nMRow, nMCol ) CLASS PUSHBUTTON
METHOD hitTest( nMRow, nMCol ) CLASS PushButton
LOCAL nCurrentPos := 1
LOCAL nLen := Len( ::cCaption )
@@ -202,7 +202,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS PUSHBUTTON
RETURN HTNOWHERE
METHOD display() CLASS PUSHBUTTON
METHOD display() CLASS PushButton
LOCAL cColor
LOCAL cStyle := ::cStyle
@@ -255,7 +255,7 @@ METHOD display() CLASS PUSHBUTTON
RETURN Self
METHOD bitmap( cBitmap ) CLASS PUSHBUTTON
METHOD bitmap( cBitmap ) CLASS PushButton
IF cBitmap != NIL
::cBitmap := __eInstVar53( Self, "BITMAP", cBitmap, "C", 1001 )
@@ -263,10 +263,10 @@ METHOD bitmap( cBitmap ) CLASS PUSHBUTTON
RETURN ::cBitmap
METHOD buffer() CLASS PUSHBUTTON
METHOD buffer() CLASS PushButton
RETURN ::lBuffer
METHOD caption( cCaption ) CLASS PUSHBUTTON
METHOD caption( cCaption ) CLASS PushButton
IF cCaption != NIL
::cCaption := __eInstVar53( Self, "CAPTION", cCaption, "C", 1001 )
@@ -274,7 +274,7 @@ METHOD caption( cCaption ) CLASS PUSHBUTTON
RETURN ::cCaption
METHOD col( nCol ) CLASS PUSHBUTTON
METHOD col( nCol ) CLASS PushButton
IF nCol != NIL
::nCol := __eInstVar53( Self, "COL", nCol, "N", 1001 )
@@ -282,7 +282,7 @@ METHOD col( nCol ) CLASS PUSHBUTTON
RETURN ::nCol
METHOD colorSpec( cColorSpec ) CLASS PUSHBUTTON
METHOD colorSpec( cColorSpec ) CLASS PushButton
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001,;
@@ -291,7 +291,7 @@ METHOD colorSpec( cColorSpec ) CLASS PUSHBUTTON
RETURN ::cColorSpec
METHOD fBlock( bFBlock ) CLASS PUSHBUTTON
METHOD fBlock( bFBlock ) CLASS PushButton
IF PCount() > 0
::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) )
@@ -299,10 +299,10 @@ METHOD fBlock( bFBlock ) CLASS PUSHBUTTON
RETURN ::bFBlock
METHOD hasFocus() CLASS PUSHBUTTON
METHOD hasFocus() CLASS PushButton
RETURN ::lHasFocus
METHOD message( cMessage ) CLASS PUSHBUTTON
METHOD message( cMessage ) CLASS PushButton
IF cMessage != NIL
::cMessage := __eInstVar53( Self, "MESSAGE", cMessage, "C", 1001 )
@@ -310,7 +310,7 @@ METHOD message( cMessage ) CLASS PUSHBUTTON
RETURN ::cMessage
METHOD row( nRow ) CLASS PUSHBUTTON
METHOD row( nRow ) CLASS PushButton
IF nRow != NIL
::nRow := __eInstVar53( Self, "ROW", nRow, "N", 1001 )
@@ -318,7 +318,7 @@ METHOD row( nRow ) CLASS PUSHBUTTON
RETURN ::nRow
METHOD sBlock( bSBlock ) CLASS PUSHBUTTON
METHOD sBlock( bSBlock ) CLASS PushButton
IF PCount() > 0
::bSBlock := iif( bSBlock == NIL, NIL, __eInstVar53( Self, "SBLOCK", bSBlock, "B", 1001 ) )
@@ -326,10 +326,10 @@ METHOD sBlock( bSBlock ) CLASS PUSHBUTTON
RETURN ::bSBlock
METHOD typeOut() CLASS PUSHBUTTON
METHOD typeOut() CLASS PushButton
RETURN .F.
METHOD style( cStyle ) CLASS PUSHBUTTON
METHOD style( cStyle ) CLASS PushButton
IF cStyle != NIL
::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 0 .OR. Len( cStyle ) == 2 .OR. Len( cStyle ) == 8 } )
@@ -337,7 +337,7 @@ METHOD style( cStyle ) CLASS PUSHBUTTON
RETURN ::cStyle
METHOD New( nRow, nCol, cCaption ) CLASS PUSHBUTTON
METHOD New( nRow, nCol, cCaption ) CLASS PushButton
LOCAL cColor

44
harbour/src/rtl/radiobtn.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* RADIOBUTTON class
* RadioButton class
*
* Copyright 2000 Luiz Rafael Culik <culik@sl.conex.net>
* www - http://harbour-project.org
@@ -64,7 +64,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS RADIOBUTTN FUNCTION HBRadioButton
CREATE CLASS RadioButtn FUNCTION HBRadioButton
EXPORTED:
@@ -111,7 +111,7 @@ CREATE CLASS RADIOBUTTN FUNCTION HBRadioButton
ENDCLASS
METHOD setFocus() CLASS RADIOBUTTN
METHOD setFocus() CLASS RadioButtn
IF ! ::lHasFocus
::lHasFocus := .T.
@@ -124,7 +124,7 @@ METHOD setFocus() CLASS RADIOBUTTN
RETURN Self
METHOD select( lState ) CLASS RADIOBUTTN
METHOD select( lState ) CLASS RadioButtn
LOCAL lOldState := ::lBuffer
@@ -138,7 +138,7 @@ METHOD select( lState ) CLASS RADIOBUTTN
RETURN Self
METHOD killFocus() CLASS RADIOBUTTN
METHOD killFocus() CLASS RadioButtn
IF ::lHasFocus
::lHasFocus := .F.
@@ -152,7 +152,7 @@ METHOD killFocus() CLASS RADIOBUTTN
RETURN Self
METHOD display() CLASS RADIOBUTTN
METHOD display() CLASS RadioButtn
LOCAL cColor
LOCAL cStyle := ::cStyle
@@ -186,7 +186,7 @@ METHOD display() CLASS RADIOBUTTN
RETURN Self
METHOD isAccel( xKey ) CLASS RADIOBUTTN
METHOD isAccel( xKey ) CLASS RadioButtn
LOCAL cKey
@@ -200,7 +200,7 @@ METHOD isAccel( xKey ) CLASS RADIOBUTTN
RETURN Len( cKey ) > 0 .AND. hb_AtI( "&" + cKey, ::cCaption ) > 0
METHOD hitTest( nMRow, nMCol ) CLASS RADIOBUTTN
METHOD hitTest( nMRow, nMCol ) CLASS RadioButtn
LOCAL nPos
LOCAL nLen
@@ -225,7 +225,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS RADIOBUTTN
RETURN HTNOWHERE
METHOD bitmaps( aBitmaps ) CLASS RADIOBUTTN
METHOD bitmaps( aBitmaps ) CLASS RadioButtn
IF aBitmaps != NIL
::aBitmaps := __eInstVar53( Self, "BITMAPS", aBitmaps, "A", 1001, {|| Len( aBitmaps ) == 2 } )
@@ -233,10 +233,10 @@ METHOD bitmaps( aBitmaps ) CLASS RADIOBUTTN
RETURN ::aBitmaps
METHOD buffer() CLASS RADIOBUTTN
METHOD buffer() CLASS RadioButtn
RETURN ::lBuffer
METHOD data( cData ) CLASS RADIOBUTTN
METHOD data( cData ) CLASS RadioButtn
IF PCount() > 0
::cData := iif( cData == NIL, NIL, __eInstVar53( Self, "DATA", cData, "C", 1001 ) )
@@ -244,7 +244,7 @@ METHOD data( cData ) CLASS RADIOBUTTN
RETURN iif( ::cData == NIL, __Caption( ::Caption ), ::cData )
METHOD capCol( nCapCol ) CLASS RADIOBUTTN
METHOD capCol( nCapCol ) CLASS RadioButtn
IF nCapCol != NIL
::nCapCol := __eInstVar53( Self, "CAPCOL", nCapCol, "N", 1001 )
@@ -252,7 +252,7 @@ METHOD capCol( nCapCol ) CLASS RADIOBUTTN
RETURN ::nCapCol
METHOD capRow( nCapRow ) CLASS RADIOBUTTN
METHOD capRow( nCapRow ) CLASS RadioButtn
IF nCapRow != NIL
::nCapRow := __eInstVar53( Self, "CAPROW", nCapRow, "N", 1001 )
@@ -260,7 +260,7 @@ METHOD capRow( nCapRow ) CLASS RADIOBUTTN
RETURN ::nCapRow
METHOD caption( cCaption ) CLASS RADIOBUTTN
METHOD caption( cCaption ) CLASS RadioButtn
IF cCaption != NIL
::cCaption := __eInstVar53( Self, "CAPTION", cCaption, "C", 1001 )
@@ -268,7 +268,7 @@ METHOD caption( cCaption ) CLASS RADIOBUTTN
RETURN ::cCaption
METHOD col( nCol ) CLASS RADIOBUTTN
METHOD col( nCol ) CLASS RadioButtn
IF nCol != NIL
::nCol := __eInstVar53( Self, "COL", nCol, "N", 1001 )
@@ -276,7 +276,7 @@ METHOD col( nCol ) CLASS RADIOBUTTN
RETURN ::nCol
METHOD colorSpec( cColorSpec ) CLASS RADIOBUTTN
METHOD colorSpec( cColorSpec ) CLASS RadioButtn
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001, ;
@@ -285,7 +285,7 @@ METHOD colorSpec( cColorSpec ) CLASS RADIOBUTTN
RETURN ::cColorSpec
METHOD fBlock( bFBlock ) CLASS RADIOBUTTN
METHOD fBlock( bFBlock ) CLASS RadioButtn
IF PCount() > 0
::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) )
@@ -293,10 +293,10 @@ METHOD fBlock( bFBlock ) CLASS RADIOBUTTN
RETURN ::bFBlock
METHOD hasFocus() CLASS RADIOBUTTN
METHOD hasFocus() CLASS RadioButtn
RETURN ::lHasFocus
METHOD row( nRow ) CLASS RADIOBUTTN
METHOD row( nRow ) CLASS RadioButtn
IF nRow != NIL
::nRow := __eInstVar53( Self, "ROW", nRow, "N", 1001 )
@@ -304,7 +304,7 @@ METHOD row( nRow ) CLASS RADIOBUTTN
RETURN ::nRow
METHOD sBlock( bSBlock ) CLASS RADIOBUTTN
METHOD sBlock( bSBlock ) CLASS RadioButtn
IF PCount() > 0
::bSBlock := iif( bSBlock == NIL, NIL, __eInstVar53( Self, "SBLOCK", bSBlock, "B", 1001 ) )
@@ -312,7 +312,7 @@ METHOD sBlock( bSBlock ) CLASS RADIOBUTTN
RETURN ::bSBlock
METHOD style( cStyle ) CLASS RADIOBUTTN
METHOD style( cStyle ) CLASS RadioButtn
IF cStyle != NIL
::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 0 .OR. Len( cStyle ) == 4 } )
@@ -320,7 +320,7 @@ METHOD style( cStyle ) CLASS RADIOBUTTN
RETURN ::cStyle
METHOD New( nRow, nCol, cCaption, cData ) CLASS RADIOBUTTN
METHOD New( nRow, nCol, cCaption, cData ) CLASS RadioButtn
LOCAL cColor

72
harbour/src/rtl/radiogrp.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* RADIOGROUP class
* RadioGroup class
*
* Copyright 2000 Luiz Rafael Culik <culik@sl.conex.net>
* www - http://harbour-project.org
@@ -66,7 +66,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS RADIOGROUP FUNCTION HBRadioGroup
CREATE CLASS RadioGroup FUNCTION HBRadioGroup
EXPORTED:
@@ -135,7 +135,7 @@ CREATE CLASS RADIOGROUP FUNCTION HBRadioGroup
ENDCLASS
METHOD addItem( oRadioButton ) CLASS RADIOGROUP
METHOD addItem( oRadioButton ) CLASS RadioGroup
IF HB_ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN"
AAdd( ::aItems, oRadioButton )
@@ -144,7 +144,7 @@ METHOD addItem( oRadioButton ) CLASS RADIOGROUP
RETURN Self
METHOD delItem( nPos ) CLASS RADIOGROUP
METHOD delItem( nPos ) CLASS RadioGroup
IF nPos >= 1 .AND. nPos <= ::nItemCount
ADel( ::aItems[ nPos ] )
@@ -159,7 +159,7 @@ METHOD delItem( nPos ) CLASS RADIOGROUP
RETURN Self
METHOD display() CLASS RADIOGROUP
METHOD display() CLASS RadioGroup
LOCAL cSelBox
LOCAL cUnSelBox
@@ -206,7 +206,7 @@ METHOD display() CLASS RADIOGROUP
RETURN Self
METHOD getAccel( xValue ) CLASS RADIOGROUP
METHOD getAccel( xValue ) CLASS RadioGroup
LOCAL cValue
@@ -225,10 +225,10 @@ METHOD getAccel( xValue ) CLASS RADIOGROUP
RETURN 0
METHOD getItem( nPos ) CLASS RADIOGROUP
METHOD getItem( nPos ) CLASS RadioGroup
RETURN iif( nPos >= 1 .AND. nPos <= ::nItemCount, ::aItems[ nPos ], NIL )
METHOD hitTest( nMRow, nMCol ) CLASS RADIOGROUP
METHOD hitTest( nMRow, nMCol ) CLASS RadioGroup
LOCAL nLen
LOCAL nPos
@@ -298,7 +298,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS RADIOGROUP
RETURN HTNOWHERE
METHOD insItem( nPos, oRadioButton ) CLASS RADIOGROUP
METHOD insItem( nPos, oRadioButton ) CLASS RadioGroup
IF HB_ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN" .AND. ;
nPos < ::nItemCount
@@ -310,7 +310,7 @@ METHOD insItem( nPos, oRadioButton ) CLASS RADIOGROUP
RETURN ::aItems[ nPos ]
METHOD killFocus() CLASS RADIOGROUP
METHOD killFocus() CLASS RadioGroup
LOCAL nPos
LOCAL nLen
@@ -348,7 +348,7 @@ METHOD killFocus() CLASS RADIOGROUP
RETURN Self
METHOD setFocus() CLASS RADIOGROUP
METHOD setFocus() CLASS RadioGroup
LOCAL nPos
LOCAL nLen
@@ -385,7 +385,7 @@ METHOD setFocus() CLASS RADIOGROUP
RETURN Self
METHOD nextItem() CLASS RADIOGROUP
METHOD nextItem() CLASS RadioGroup
LOCAL nValue
@@ -395,7 +395,7 @@ METHOD nextItem() CLASS RADIOGROUP
RETURN Self
METHOD prevItem() CLASS RADIOGROUP
METHOD prevItem() CLASS RadioGroup
LOCAL nValue
LOCAL nPos
@@ -416,7 +416,7 @@ METHOD prevItem() CLASS RADIOGROUP
RETURN Self
METHOD select( xValue ) CLASS RADIOGROUP
METHOD select( xValue ) CLASS RadioGroup
LOCAL cType := ValType( xValue )
LOCAL nPos
@@ -454,7 +454,7 @@ METHOD select( xValue ) CLASS RADIOGROUP
RETURN Self
METHOD setColor( cColorSpec ) CLASS RADIOGROUP
METHOD setColor( cColorSpec ) CLASS RadioGroup
LOCAL nPos
LOCAL nLen := ::nItemCount
@@ -466,7 +466,7 @@ METHOD setColor( cColorSpec ) CLASS RADIOGROUP
RETURN Self
METHOD setStyle( cStyle ) CLASS RADIOGROUP
METHOD setStyle( cStyle ) CLASS RadioGroup
LOCAL nPos
LOCAL nLen := ::nItemCount
@@ -478,7 +478,7 @@ METHOD setStyle( cStyle ) CLASS RADIOGROUP
RETURN Self
METHOD changeButton( nUnselect, nSelect ) CLASS RADIOGROUP
METHOD changeButton( nUnselect, nSelect ) CLASS RadioGroup
LOCAL nOldMCur := MSetCursor( .F. )
@@ -507,7 +507,7 @@ METHOD changeButton( nUnselect, nSelect ) CLASS RADIOGROUP
RETURN Self
METHOD bottom( nBottom ) CLASS RADIOGROUP
METHOD bottom( nBottom ) CLASS RadioGroup
IF nBottom != NIL
::nBottom := __eInstVar53( Self, "BOTTOM", nBottom, "N", 1001 )
@@ -515,10 +515,10 @@ METHOD bottom( nBottom ) CLASS RADIOGROUP
RETURN ::nBottom
METHOD buffer() CLASS RADIOGROUP
METHOD buffer() CLASS RadioGroup
RETURN ::xBuffer
METHOD capCol( nCapCol ) CLASS RADIOGROUP
METHOD capCol( nCapCol ) CLASS RadioGroup
IF nCapCol != NIL
::nCapCol := __eInstVar53( Self, "CAPCOL", nCapCol, "N", 1001 )
@@ -526,7 +526,7 @@ METHOD capCol( nCapCol ) CLASS RADIOGROUP
RETURN ::nCapCol
METHOD capRow( nCapRow ) CLASS RADIOGROUP
METHOD capRow( nCapRow ) CLASS RadioGroup
IF nCapRow != NIL
::nCapRow := __eInstVar53( Self, "CAPROW", nCapRow, "N", 1001 )
@@ -534,7 +534,7 @@ METHOD capRow( nCapRow ) CLASS RADIOGROUP
RETURN ::nCapRow
METHOD caption( cCaption ) CLASS RADIOGROUP
METHOD caption( cCaption ) CLASS RadioGroup
IF cCaption != NIL
::cCaption := __eInstVar53( Self, "CAPTION", cCaption, "C", 1001 )
@@ -542,7 +542,7 @@ METHOD caption( cCaption ) CLASS RADIOGROUP
RETURN ::cCaption
METHOD coldBox( cColdBox ) CLASS RADIOGROUP
METHOD coldBox( cColdBox ) CLASS RadioGroup
IF cColdBox != NIL
::cColdBox := __eInstVar53( Self, "COLDBOX", cColdBox, "C", 1001, {|| Len( cColdBox ) == 0 .OR. Len( cColdBox ) == 8 } )
@@ -550,7 +550,7 @@ METHOD coldBox( cColdBox ) CLASS RADIOGROUP
RETURN ::cColdBox
METHOD colorSpec( cColorSpec ) CLASS RADIOGROUP
METHOD colorSpec( cColorSpec ) CLASS RadioGroup
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001, ;
@@ -559,7 +559,7 @@ METHOD colorSpec( cColorSpec ) CLASS RADIOGROUP
RETURN ::cColorSpec
METHOD fBlock( bFBlock ) CLASS RADIOGROUP
METHOD fBlock( bFBlock ) CLASS RadioGroup
IF PCount() > 0
::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) )
@@ -567,10 +567,10 @@ METHOD fBlock( bFBlock ) CLASS RADIOGROUP
RETURN ::bFBlock
METHOD hasFocus() CLASS RADIOGROUP
METHOD hasFocus() CLASS RadioGroup
RETURN ::lHasFocus
METHOD hotBox( cHotBox ) CLASS RADIOGROUP
METHOD hotBox( cHotBox ) CLASS RadioGroup
IF cHotBox != NIL
::cHotBox := __eInstVar53( Self, "HOTBOX", cHotBox, "C", 1001, {|| Len( cHotBox ) == 0 .OR. Len( cHotBox ) == 8 } )
@@ -578,10 +578,10 @@ METHOD hotBox( cHotBox ) CLASS RADIOGROUP
RETURN ::cHotBox
METHOD itemCount() CLASS RADIOGROUP
METHOD itemCount() CLASS RadioGroup
RETURN ::nItemCount
METHOD left( nLeft ) CLASS RADIOGROUP
METHOD left( nLeft ) CLASS RadioGroup
IF nLeft != NIL
::nLeft := __eInstVar53( Self, "LEFT", nLeft, "N", 1001 )
@@ -589,7 +589,7 @@ METHOD left( nLeft ) CLASS RADIOGROUP
RETURN ::nLeft
METHOD message( cMessage ) CLASS RADIOGROUP
METHOD message( cMessage ) CLASS RadioGroup
IF cMessage != NIL
::cMessage := __eInstVar53( Self, "MESSAGE", cMessage, "C", 1001 )
@@ -597,7 +597,7 @@ METHOD message( cMessage ) CLASS RADIOGROUP
RETURN ::cMessage
METHOD right( nRight ) CLASS RADIOGROUP
METHOD right( nRight ) CLASS RadioGroup
IF nRight != NIL
::nRight := __eInstVar53( Self, "RIGHT", nRight, "N", 1001 )
@@ -605,10 +605,10 @@ METHOD right( nRight ) CLASS RADIOGROUP
RETURN ::nRight
METHOD textValue() CLASS RADIOGROUP
METHOD textValue() CLASS RadioGroup
RETURN ::cTextValue
METHOD top( nTop ) CLASS RADIOGROUP
METHOD top( nTop ) CLASS RadioGroup
IF nTop != NIL
::nTop := __eInstVar53( Self, "TOP", nTop, "N", 1001 )
@@ -616,13 +616,13 @@ METHOD top( nTop ) CLASS RADIOGROUP
RETURN ::nTop
METHOD typeOut() CLASS RADIOGROUP
METHOD typeOut() CLASS RadioGroup
RETURN ::nItemCount == 0 .OR. ::nValue > ::nItemCount
METHOD value() CLASS RADIOGROUP
METHOD value() CLASS RadioGroup
RETURN ::nValue
METHOD New( nTop, nLeft, nBottom, nRight ) CLASS RADIOGROUP
METHOD New( nTop, nLeft, nBottom, nRight ) CLASS RadioGroup
LOCAL cColor

36
harbour/src/rtl/scrollbr.prg
View File

@@ -64,7 +64,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS SCROLLBAR FUNCTION HBScrollBar
CREATE CLASS ScrollBar FUNCTION HBScrollBar
EXPORTED:
@@ -110,7 +110,7 @@ CREATE CLASS SCROLLBAR FUNCTION HBScrollBar
ENDCLASS
METHOD display() CLASS SCROLLBAR
METHOD display() CLASS ScrollBar
LOCAL cColor
LOCAL cStyle
@@ -158,7 +158,7 @@ METHOD display() CLASS SCROLLBAR
RETURN .F.
METHOD update() CLASS SCROLLBAR
METHOD update() CLASS ScrollBar
LOCAL nOldThumbPos := ::nThumbPos
@@ -185,7 +185,7 @@ METHOD update() CLASS SCROLLBAR
RETURN .F.
METHOD hitTest( nMRow, nMCol ) CLASS SCROLLBAR
METHOD hitTest( nMRow, nMCol ) CLASS ScrollBar
IF ::nOrient == SCROLL_VERTICAL
@@ -247,10 +247,10 @@ METHOD hitTest( nMRow, nMCol ) CLASS SCROLLBAR
RETURN HTNOWHERE
METHOD barLength() CLASS SCROLLBAR
METHOD barLength() CLASS ScrollBar
RETURN ::nBarLength
METHOD bitmaps( aBitmaps ) CLASS SCROLLBAR
METHOD bitmaps( aBitmaps ) CLASS ScrollBar
IF HB_ISARRAY( aBitmaps ) .AND. ;
Len( aBitmaps ) == 3
@@ -260,7 +260,7 @@ METHOD bitmaps( aBitmaps ) CLASS SCROLLBAR
RETURN ::aBitmaps
METHOD colorSpec( cColorSpec ) CLASS SCROLLBAR
METHOD colorSpec( cColorSpec ) CLASS ScrollBar
IF HB_ISSTRING( cColorSpec ) .AND. ;
! Empty( hb_ColorIndex( cColorSpec, 1 ) ) .AND. ;
@@ -271,7 +271,7 @@ METHOD colorSpec( cColorSpec ) CLASS SCROLLBAR
RETURN ::cColorSpec
METHOD current( nCurrent ) CLASS SCROLLBAR
METHOD current( nCurrent ) CLASS ScrollBar
IF HB_ISNUMERIC( nCurrent ) .AND. ;
nCurrent <= ::nTotal .AND. ;
@@ -282,7 +282,7 @@ METHOD current( nCurrent ) CLASS SCROLLBAR
RETURN ::nCurrent
METHOD end( nEnd ) CLASS SCROLLBAR
METHOD end( nEnd ) CLASS ScrollBar
IF HB_ISNUMERIC( nEnd ) .AND. ;
nEnd >= ::nStart .AND. ;
@@ -294,7 +294,7 @@ METHOD end( nEnd ) CLASS SCROLLBAR
RETURN ::nEnd
METHOD offset( nOffset ) CLASS SCROLLBAR
METHOD offset( nOffset ) CLASS ScrollBar
IF HB_ISNUMERIC( nOffset ) .AND. ;
nOffset != ::nOffset
@@ -304,7 +304,7 @@ METHOD offset( nOffset ) CLASS SCROLLBAR
RETURN ::nOffset
METHOD orient( nOrient ) CLASS SCROLLBAR
METHOD orient( nOrient ) CLASS ScrollBar
IF HB_ISNUMERIC( nOrient ) .AND. ;
( nOrient == SCROLL_VERTICAL .OR. nOrient == SCROLL_HORIZONTAL )
@@ -314,7 +314,7 @@ METHOD orient( nOrient ) CLASS SCROLLBAR
RETURN ::nOrient
METHOD sBlock( bSBlock ) CLASS SCROLLBAR
METHOD sBlock( bSBlock ) CLASS ScrollBar
IF HB_ISBLOCK( bSBlock )
::bSBlock := bSBlock
@@ -322,7 +322,7 @@ METHOD sBlock( bSBlock ) CLASS SCROLLBAR
RETURN ::bSBlock
METHOD start( nStart ) CLASS SCROLLBAR
METHOD start( nStart ) CLASS ScrollBar
IF HB_ISNUMERIC( nStart ) .AND. ;
nStart <= ::nEnd .AND. ;
@@ -334,7 +334,7 @@ METHOD start( nStart ) CLASS SCROLLBAR
RETURN ::nStart
METHOD style( cStyle ) CLASS SCROLLBAR
METHOD style( cStyle ) CLASS ScrollBar
IF HB_ISSTRING( cStyle ) .AND. ;
Len( cStyle ) == 4
@@ -344,7 +344,7 @@ METHOD style( cStyle ) CLASS SCROLLBAR
RETURN ::cStyle
METHOD thumbPos( nThumbPos ) CLASS SCROLLBAR
METHOD thumbPos( nThumbPos ) CLASS ScrollBar
IF HB_ISNUMERIC( nThumbPos )
@@ -363,7 +363,7 @@ METHOD thumbPos( nThumbPos ) CLASS SCROLLBAR
RETURN ::nThumbPos
METHOD total( nTotal ) CLASS SCROLLBAR
METHOD total( nTotal ) CLASS ScrollBar
IF HB_ISNUMERIC( nTotal ) .AND. ;
nTotal >= 2 .AND. ;
@@ -374,7 +374,7 @@ METHOD total( nTotal ) CLASS SCROLLBAR
RETURN ::nTotal
METHOD CalcThumbPos() CLASS SCROLLBAR
METHOD CalcThumbPos() CLASS ScrollBar
LOCAL nBarLength := ::nBarLength
LOCAL nTotal := ::nTotal
@@ -399,7 +399,7 @@ METHOD CalcThumbPos() CLASS SCROLLBAR
#define SB_THUMB hb_UTF8ToStr( "░" )
#define SB_TRACK hb_UTF8ToStr( "▓" )
METHOD New( nStart, nEnd, nOffset, bSBlock, nOrient ) CLASS SCROLLBAR
METHOD New( nStart, nEnd, nOffset, bSBlock, nOrient ) CLASS ScrollBar
LOCAL cColor

30
harbour/src/rtl/tbcolumn.prg
View File

@@ -55,9 +55,9 @@
#include "tbrowse.ch"
/* NOTE: In CA-Cl*pper TBCOLUMN class does not inherit from any other classes. */
/* NOTE: In CA-Cl*pper TBColumn class does not inherit from any other classes. */
CREATE CLASS TBCOLUMN
CREATE CLASS TBColumn
EXPORTED:
@@ -99,7 +99,7 @@ CREATE CLASS TBCOLUMN
ENDCLASS
METHOD block( bBlock ) CLASS TBCOLUMN
METHOD block( bBlock ) CLASS TBColumn
IF bBlock != NIL
::bBlock := __eInstVar53( Self, "BLOCK", bBlock, "B", 1001 )
@@ -107,7 +107,7 @@ METHOD block( bBlock ) CLASS TBCOLUMN
RETURN ::bBlock
METHOD colorBlock( bColorBlock ) CLASS TBCOLUMN
METHOD colorBlock( bColorBlock ) CLASS TBColumn
IF bColorBlock != NIL
::bColorBlock := __eInstVar53( Self, "COLORBLOCK", bColorBlock, "B", 1001 )
@@ -115,7 +115,7 @@ METHOD colorBlock( bColorBlock ) CLASS TBCOLUMN
RETURN ::bColorBlock
METHOD defColor( aDefColor ) CLASS TBCOLUMN
METHOD defColor( aDefColor ) CLASS TBColumn
IF aDefColor != NIL
::aDefColor := __eInstVar53( Self, "DEFCOLOR", aDefColor, "A", 1001 )
@@ -123,7 +123,7 @@ METHOD defColor( aDefColor ) CLASS TBCOLUMN
RETURN ::aDefColor
METHOD colSep( cColSep ) CLASS TBCOLUMN
METHOD colSep( cColSep ) CLASS TBColumn
IF cColSep != NIL
::cColSep := __eInstVar53( Self, "COLSEP", cColSep, "C", 1001 )
@@ -131,7 +131,7 @@ METHOD colSep( cColSep ) CLASS TBCOLUMN
RETURN ::cColSep
METHOD heading( cHeading ) CLASS TBCOLUMN
METHOD heading( cHeading ) CLASS TBColumn
IF cHeading != NIL
::cHeading := __eInstVar53( Self, "HEADING", cHeading, "C", 1001 )
@@ -139,7 +139,7 @@ METHOD heading( cHeading ) CLASS TBCOLUMN
RETURN ::cHeading
METHOD footing( cFooting ) CLASS TBCOLUMN
METHOD footing( cFooting ) CLASS TBColumn
IF cFooting != NIL
::cFooting := __eInstVar53( Self, "FOOTING", cFooting, "C", 1001 )
@@ -147,7 +147,7 @@ METHOD footing( cFooting ) CLASS TBCOLUMN
RETURN ::cFooting
METHOD headSep( cHeadSep ) CLASS TBCOLUMN
METHOD headSep( cHeadSep ) CLASS TBColumn
IF cHeadSep != NIL
::cHeadSep := __eInstVar53( Self, "HEADSEP", cHeadSep, "C", 1001 )
@@ -155,7 +155,7 @@ METHOD headSep( cHeadSep ) CLASS TBCOLUMN
RETURN ::cHeadSep
METHOD footSep( cFootSep ) CLASS TBCOLUMN
METHOD footSep( cFootSep ) CLASS TBColumn
IF cFootSep != NIL
::cFootSep := __eInstVar53( Self, "FOOTSEP", cFootSep, "C", 1001 )
@@ -163,7 +163,7 @@ METHOD footSep( cFootSep ) CLASS TBCOLUMN
RETURN ::cFootSep
METHOD width( nWidth ) CLASS TBCOLUMN
METHOD width( nWidth ) CLASS TBColumn
IF nWidth != NIL
::nWidth := __eInstVar53( Self, "WIDTH", nWidth, "N", 1001 )
@@ -173,7 +173,7 @@ METHOD width( nWidth ) CLASS TBCOLUMN
#ifdef HB_COMPAT_C53
METHOD preBlock( bPreBlock ) CLASS TBCOLUMN
METHOD preBlock( bPreBlock ) CLASS TBColumn
IF bPreBlock != NIL
::bPreBlock := __eInstVar53( Self, "PREBLOCK", bPreBlock, "B", 1001 )
@@ -181,7 +181,7 @@ METHOD preBlock( bPreBlock ) CLASS TBCOLUMN
RETURN ::bPreBlock
METHOD postBlock( bPostBlock ) CLASS TBCOLUMN
METHOD postBlock( bPostBlock ) CLASS TBColumn
IF bPostBlock != NIL
::bPostBlock := __eInstVar53( Self, "POSTBLOCK", bPostBlock, "B", 1001 )
@@ -189,7 +189,7 @@ METHOD postBlock( bPostBlock ) CLASS TBCOLUMN
RETURN ::bPostBlock
METHOD setStyle( nStyle, lNewValue ) CLASS TBCOLUMN
METHOD setStyle( nStyle, lNewValue ) CLASS TBColumn
/* NOTE: CA-Cl*pper 5.3 does no checks on the value of nStyle, so in case
it is zero or non-numeric, a regular RTE will happen. [vszakats] */
@@ -206,7 +206,7 @@ METHOD setStyle( nStyle, lNewValue ) CLASS TBCOLUMN
#endif
METHOD New( cHeading, bBlock ) CLASS TBCOLUMN
METHOD New( cHeading, bBlock ) CLASS TBColumn
::cHeading := cHeading /* NOTE: CA-Cl*pper will allow any types for the heading here. [vszakats] */
::bBlock := bBlock /* NOTE: CA-Cl*pper allows any types here. [vszakats] */

166
harbour/src/rtl/tbrowse.prg
View File

@@ -66,7 +66,7 @@
/* HB_BRW_STATICMOUSE controls if mouse position is static
* and set by call to HitTest() method or dynamic calculated
* by calls to MPOS() / MCol(). CL53 uses dynamic mouse but
* I guess that some Harbour GUI libraries inherit from TBROWSE
* I guess that some Harbour GUI libraries inherit from TBrowse
* and because they do not support MCol()/MRow() (when someone
* will create GUI library integrated with GT system?) then they
* need static mouse with positions passed by GUI code. [druzus]
@@ -108,7 +108,7 @@
#define _TBR_COORD( n ) Int( n )
CREATE CLASS TBROWSE
CREATE CLASS TBrowse
/* The first 18 instance variables are exactly the same as in Clipper
* so also some code which access them directly by array indexes should work
@@ -306,7 +306,7 @@ FUNCTION TBrowseNew( nTop, nLeft, nBottom, nRight )
RETURN TBrowse():new( nTop, nLeft, nBottom, nRight )
METHOD new( nTop, nLeft, nBottom, nRight ) CLASS TBROWSE
METHOD new( nTop, nLeft, nBottom, nRight ) CLASS TBrowse
__defaultNIL( @nTop, 0 )
__defaultNIL( @nLeft, 0 )
@@ -437,7 +437,7 @@ STATIC PROCEDURE _DISP_FHNAME( nRow, nHeight, nLeft, nRight, nType, nColor, aCol
RETURN
METHOD dispFrames() CLASS TBROWSE
METHOD dispFrames() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -475,7 +475,7 @@ METHOD dispFrames() CLASS TBROWSE
RETURN Self
METHOD dispRow( nRow ) CLASS TBROWSE
METHOD dispRow( nRow ) CLASS TBrowse
LOCAL nRowPos, nColPos
LOCAL aCol
@@ -527,7 +527,7 @@ METHOD dispRow( nRow ) CLASS TBROWSE
RETURN Self
METHOD colorRect( aRect, aColors ) CLASS TBROWSE
METHOD colorRect( aRect, aColors ) CLASS TBrowse
LOCAL nRow := ::rowCount
LOCAL nCol := ::colCount
@@ -562,7 +562,7 @@ METHOD colorRect( aRect, aColors ) CLASS TBROWSE
RETURN Self
METHOD scrollBuffer( nRows ) CLASS TBROWSE
METHOD scrollBuffer( nRows ) CLASS TBrowse
LOCAL nRowCount := ::rowCount
LOCAL aValues, aColors
@@ -602,7 +602,7 @@ METHOD scrollBuffer( nRows ) CLASS TBROWSE
RETURN Self
METHOD readRecord( nRow ) CLASS TBROWSE
METHOD readRecord( nRow ) CLASS TBrowse
LOCAL aCol
LOCAL oCol
@@ -668,7 +668,7 @@ METHOD readRecord( nRow ) CLASS TBROWSE
RETURN lRead
METHOD setPosition() CLASS TBROWSE
METHOD setPosition() CLASS TBrowse
LOCAL nMoved
LOCAL nRowCount := ::rowCount
@@ -743,7 +743,7 @@ METHOD setPosition() CLASS TBROWSE
RETURN Self
METHOD stabilize() CLASS TBROWSE
METHOD stabilize() CLASS TBrowse
LOCAL nRowCount, nToMove, nMoved
LOCAL lDisp, lRead, lStat
@@ -841,7 +841,7 @@ METHOD stabilize() CLASS TBROWSE
RETURN .T.
METHOD forceStable() CLASS TBROWSE
METHOD forceStable() CLASS TBrowse
/* TODO: CA-Cl*pper does not call ::stabilize() if TBrowse object
* is stable and does not need screen update. It may be important
@@ -862,7 +862,7 @@ METHOD forceStable() CLASS TBROWSE
RETURN Self
METHOD colorValue( nColorIndex ) CLASS TBROWSE
METHOD colorValue( nColorIndex ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -880,7 +880,7 @@ METHOD colorValue( nColorIndex ) CLASS TBROWSE
RETURN ::aColors[ _TBC_CLR_STANDARD ]
METHOD cellValue( nRow, nCol ) CLASS TBROWSE
METHOD cellValue( nRow, nCol ) CLASS TBrowse
IF nRow >= 1 .AND. nRow <= ::rowCount .AND. ;
nCol >= 1 .AND. nCol <= ::colCount .AND. ;
@@ -892,7 +892,7 @@ METHOD cellValue( nRow, nCol ) CLASS TBROWSE
RETURN NIL
METHOD cellColor( nRow, nCol ) CLASS TBROWSE
METHOD cellColor( nRow, nCol ) CLASS TBrowse
IF nRow >= 1 .AND. nRow <= ::rowCount .AND. ;
nCol >= 1 .AND. nCol <= ::colCount .AND. ;
@@ -1000,7 +1000,7 @@ STATIC FUNCTION _CELLCOLORS( aCol, xValue, nMaxColorIndex )
RETURN aColors
METHOD setCursorPos() CLASS TBROWSE
METHOD setCursorPos() CLASS TBrowse
LOCAL aCol
LOCAL nRow, nCol
@@ -1034,7 +1034,7 @@ METHOD setCursorPos() CLASS TBROWSE
RETURN .F.
METHOD setUnstable() CLASS TBROWSE
METHOD setUnstable() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -1052,7 +1052,7 @@ METHOD setUnstable() CLASS TBROWSE
RETURN Self
METHOD invalidate() CLASS TBROWSE
METHOD invalidate() CLASS TBrowse
::setUnstable()
::lInvalid := .T.
@@ -1061,7 +1061,7 @@ METHOD invalidate() CLASS TBROWSE
RETURN Self
METHOD refreshAll() CLASS TBROWSE
METHOD refreshAll() CLASS TBrowse
::setUnstable()
@@ -1077,7 +1077,7 @@ METHOD refreshAll() CLASS TBROWSE
RETURN Self
METHOD refreshCurrent() CLASS TBROWSE
METHOD refreshCurrent() CLASS TBrowse
::setUnstable()
@@ -1088,7 +1088,7 @@ METHOD refreshCurrent() CLASS TBROWSE
RETURN Self
METHOD up() CLASS TBROWSE
METHOD up() CLASS TBrowse
::setUnstable()
::nMoveOffset--
@@ -1096,7 +1096,7 @@ METHOD up() CLASS TBROWSE
RETURN Self
METHOD down() CLASS TBROWSE
METHOD down() CLASS TBrowse
::setUnstable()
::nMoveOffset++
@@ -1104,7 +1104,7 @@ METHOD down() CLASS TBROWSE
RETURN Self
METHOD pageUp() CLASS TBROWSE
METHOD pageUp() CLASS TBrowse
::setUnstable()
::nMoveOffset -= ::rowCount
@@ -1112,7 +1112,7 @@ METHOD pageUp() CLASS TBROWSE
RETURN Self
METHOD pageDown() CLASS TBROWSE
METHOD pageDown() CLASS TBrowse
::setUnstable()
::nMoveOffset += ::rowCount
@@ -1120,7 +1120,7 @@ METHOD pageDown() CLASS TBROWSE
RETURN Self
METHOD left() CLASS TBROWSE
METHOD left() CLASS TBrowse
::setUnstable()
DO WHILE .T.
@@ -1134,7 +1134,7 @@ METHOD left() CLASS TBROWSE
RETURN Self
METHOD right() CLASS TBROWSE
METHOD right() CLASS TBrowse
::setUnstable()
DO WHILE .T.
@@ -1148,7 +1148,7 @@ METHOD right() CLASS TBROWSE
RETURN Self
METHOD home() CLASS TBROWSE
METHOD home() CLASS TBrowse
::setUnstable()
::nColPos := iif( ::nLeftVisible < ::nRightVisible, ;
@@ -1156,7 +1156,7 @@ METHOD home() CLASS TBROWSE
RETURN Self
METHOD end() CLASS TBROWSE
METHOD end() CLASS TBrowse
::setUnstable()
::nColPos := ::nRightVisible
@@ -1164,7 +1164,7 @@ METHOD end() CLASS TBROWSE
RETURN Self
METHOD panLeft() CLASS TBROWSE
METHOD panLeft() CLASS TBrowse
LOCAL nNewPos
@@ -1180,7 +1180,7 @@ METHOD panLeft() CLASS TBROWSE
RETURN Self
METHOD panRight() CLASS TBROWSE
METHOD panRight() CLASS TBrowse
LOCAL nNewPos
@@ -1196,7 +1196,7 @@ METHOD panRight() CLASS TBROWSE
RETURN Self
METHOD panHome() CLASS TBROWSE
METHOD panHome() CLASS TBrowse
::setUnstable()
::nColPos := _NEXTCOLUMN( ::aColData, 1 )
@@ -1204,7 +1204,7 @@ METHOD panHome() CLASS TBROWSE
RETURN Self
METHOD panEnd() CLASS TBROWSE
METHOD panEnd() CLASS TBrowse
::setUnstable()
::nColPos := _PREVCOLUMN( ::aColData, ::colCount )
@@ -1212,7 +1212,7 @@ METHOD panEnd() CLASS TBROWSE
RETURN Self
METHOD goTop() CLASS TBROWSE
METHOD goTop() CLASS TBrowse
::setUnstable()
@@ -1230,7 +1230,7 @@ METHOD goTop() CLASS TBROWSE
RETURN Self
METHOD goBottom() CLASS TBROWSE
METHOD goBottom() CLASS TBrowse
LOCAL nMoved
@@ -1251,7 +1251,7 @@ METHOD goBottom() CLASS TBROWSE
RETURN Self
METHOD configure( nMode ) CLASS TBROWSE
METHOD configure( nMode ) CLASS TBrowse
/* method configure() does not touch the screen contents or
* cursor position. In CA-Cl*pper it only sets flag indicating
@@ -1267,7 +1267,7 @@ METHOD configure( nMode ) CLASS TBROWSE
RETURN Self
METHOD doConfigure() CLASS TBROWSE
METHOD doConfigure() CLASS TBrowse
LOCAL oCol
LOCAL aCol, aVal
@@ -1710,7 +1710,7 @@ STATIC PROCEDURE _SETVISIBLE( aColData, nWidth, nFrozen, nLeft, nRight )
/* set visible columns */
METHOD setVisible() CLASS TBROWSE
METHOD setVisible() CLASS TBrowse
LOCAL nCol, nLeft, nFrozen, nLast, nColumns, nWidth, nColPos
LOCAL lFirst, lFrames
@@ -1820,7 +1820,7 @@ METHOD setVisible() CLASS TBROWSE
RETURN Self
METHOD hiLite() CLASS TBROWSE
METHOD hiLite() CLASS TBrowse
LOCAL cValue, cColor
@@ -1847,7 +1847,7 @@ METHOD hiLite() CLASS TBROWSE
RETURN Self
METHOD deHilite() CLASS TBROWSE
METHOD deHilite() CLASS TBrowse
LOCAL cValue, cColor
@@ -1875,7 +1875,7 @@ METHOD deHilite() CLASS TBROWSE
/* Returns the display width of a particular column */
METHOD colWidth( nColumn ) CLASS TBROWSE
METHOD colWidth( nColumn ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -1889,7 +1889,7 @@ METHOD colWidth( nColumn ) CLASS TBROWSE
/* get number of frozen columns */
METHOD getFrozen() CLASS TBROWSE
METHOD getFrozen() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -1899,7 +1899,7 @@ METHOD getFrozen() CLASS TBROWSE
/* set number of columns to freeze */
METHOD freeze( nColumns ) CLASS TBROWSE
METHOD freeze( nColumns ) CLASS TBrowse
LOCAL nCols
@@ -1929,7 +1929,7 @@ METHOD freeze( nColumns ) CLASS TBROWSE
/* get/set string value with color table for the TBrowse display */
METHOD colorSpec( cColorSpec ) CLASS TBROWSE
METHOD colorSpec( cColorSpec ) CLASS TBrowse
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001 )
@@ -1939,12 +1939,12 @@ METHOD colorSpec( cColorSpec ) CLASS TBROWSE
RETURN ::cColorSpec
METHOD colCount() CLASS TBROWSE
METHOD colCount() CLASS TBrowse
RETURN Len( ::columns )
METHOD rowCount() CLASS TBROWSE
METHOD rowCount() CLASS TBrowse
LOCAL nRows
@@ -1962,7 +1962,7 @@ METHOD rowCount() CLASS TBROWSE
/* NOTE: CA-Cl*pper has a bug where negative nRowPos value will be translated
to 16bit unsigned int, so the behaviour will be different in this case.
[vszakats] */
METHOD setRowPos( nRowPos ) CLASS TBROWSE
METHOD setRowPos( nRowPos ) CLASS TBrowse
LOCAL nRow
LOCAL nRowCount := ::rowCount /* executes doConfigure internally */
@@ -1980,7 +1980,7 @@ METHOD setRowPos( nRowPos ) CLASS TBROWSE
RETURN ::nRowPos
METHOD getRowPos() CLASS TBROWSE
METHOD getRowPos() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -1992,7 +1992,7 @@ METHOD getRowPos() CLASS TBROWSE
/* NOTE: CA-Cl*pper has a bug where negative nRowPos value will be translated
to 16bit unsigned int, so the behaviour will be different in this case.
[vszakats] */
METHOD setColPos( nColPos ) CLASS TBROWSE
METHOD setColPos( nColPos ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2007,7 +2007,7 @@ METHOD setColPos( nColPos ) CLASS TBROWSE
RETURN ::nColPos
METHOD getColPos() CLASS TBROWSE
METHOD getColPos() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2016,7 +2016,7 @@ METHOD getColPos() CLASS TBROWSE
RETURN ::nColPos
METHOD getTopFlag() CLASS TBROWSE
METHOD getTopFlag() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2025,7 +2025,7 @@ METHOD getTopFlag() CLASS TBROWSE
RETURN ::lHitTop
METHOD setTopFlag( lTop ) CLASS TBROWSE
METHOD setTopFlag( lTop ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2040,7 +2040,7 @@ METHOD setTopFlag( lTop ) CLASS TBROWSE
RETURN lTop
METHOD getBottomFlag() CLASS TBROWSE
METHOD getBottomFlag() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2049,7 +2049,7 @@ METHOD getBottomFlag() CLASS TBROWSE
RETURN ::lHitBottom
METHOD setBottomFlag( lBottom ) CLASS TBROWSE
METHOD setBottomFlag( lBottom ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2064,7 +2064,7 @@ METHOD setBottomFlag( lBottom ) CLASS TBROWSE
RETURN lBottom
METHOD getAutoLite() CLASS TBROWSE
METHOD getAutoLite() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2073,7 +2073,7 @@ METHOD getAutoLite() CLASS TBROWSE
RETURN ::lAutoLite
METHOD setAutoLite( lAutoLite ) CLASS TBROWSE
METHOD setAutoLite( lAutoLite ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2088,7 +2088,7 @@ METHOD setAutoLite( lAutoLite ) CLASS TBROWSE
RETURN lAutoLite
METHOD getStableFlag() CLASS TBROWSE
METHOD getStableFlag() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2097,7 +2097,7 @@ METHOD getStableFlag() CLASS TBROWSE
RETURN ::lStable
METHOD setStableFlag( lStable ) CLASS TBROWSE
METHOD setStableFlag( lStable ) CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2112,7 +2112,7 @@ METHOD setStableFlag( lStable ) CLASS TBROWSE
RETURN lStable
METHOD leftVisible() CLASS TBROWSE
METHOD leftVisible() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2121,7 +2121,7 @@ METHOD leftVisible() CLASS TBROWSE
RETURN ::nLeftVisible
METHOD rightVisible() CLASS TBROWSE
METHOD rightVisible() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2131,7 +2131,7 @@ METHOD rightVisible() CLASS TBROWSE
/* Adds a TBColumn object to the TBrowse object */
METHOD addColumn( oCol ) CLASS TBROWSE
METHOD addColumn( oCol ) CLASS TBrowse
/* NOTE: CA-Cl*pper doesn't check the parameters. */
@@ -2142,7 +2142,7 @@ METHOD addColumn( oCol ) CLASS TBROWSE
/* Delete a column object from a browse */
METHOD delColumn( nColumn ) CLASS TBROWSE
METHOD delColumn( nColumn ) CLASS TBrowse
LOCAL oCol
@@ -2161,7 +2161,7 @@ METHOD delColumn( nColumn ) CLASS TBROWSE
/* Insert a column object in a browse */
METHOD insColumn( nColumn, oCol ) CLASS TBROWSE
METHOD insColumn( nColumn, oCol ) CLASS TBrowse
/* NOTE: CA-Cl*pper doesn't check the parameters. */
#ifndef HB_CLP_STRICT
@@ -2177,7 +2177,7 @@ METHOD insColumn( nColumn, oCol ) CLASS TBROWSE
/* Replaces one TBColumn object with another */
METHOD setColumn( nColumn, oCol ) CLASS TBROWSE
METHOD setColumn( nColumn, oCol ) CLASS TBrowse
LOCAL oPrevCol
@@ -2212,7 +2212,7 @@ METHOD setColumn( nColumn, oCol ) CLASS TBROWSE
/* Gets a specific TBColumn object */
METHOD getColumn( nColumn ) CLASS TBROWSE
METHOD getColumn( nColumn ) CLASS TBrowse
#ifdef HB_CLP_STRICT
RETURN ::columns[ nColumn ]
@@ -2221,7 +2221,7 @@ METHOD getColumn( nColumn ) CLASS TBROWSE
#endif
METHOD footSep( cFootSep ) CLASS TBROWSE
METHOD footSep( cFootSep ) CLASS TBrowse
IF cFootSep != NIL
::cFootSep := __eInstVar53( Self, "FOOTSEP", cFootSep, "C", 1001 )
@@ -2230,7 +2230,7 @@ METHOD footSep( cFootSep ) CLASS TBROWSE
RETURN ::cFootSep
METHOD colSep( cColSep ) CLASS TBROWSE
METHOD colSep( cColSep ) CLASS TBrowse
IF cColSep != NIL
::cColSep := __eInstVar53( Self, "COLSEP", cColSep, "C", 1001 )
@@ -2239,7 +2239,7 @@ METHOD colSep( cColSep ) CLASS TBROWSE
RETURN ::cColSep
METHOD headSep( cHeadSep ) CLASS TBROWSE
METHOD headSep( cHeadSep ) CLASS TBrowse
IF cHeadSep != NIL
::cHeadSep := __eInstVar53( Self, "HEADSEP", cHeadSep, "C", 1001 )
@@ -2248,7 +2248,7 @@ METHOD headSep( cHeadSep ) CLASS TBROWSE
RETURN ::cHeadSep
METHOD skipBlock( bSkipBlock ) CLASS TBROWSE
METHOD skipBlock( bSkipBlock ) CLASS TBrowse
IF bSkipBlock != NIL
::bSkipBlock := __eInstVar53( Self, "SKIPBLOCK", bSkipBlock, "B", 1001 )
@@ -2257,7 +2257,7 @@ METHOD skipBlock( bSkipBlock ) CLASS TBROWSE
RETURN ::bSkipBlock
METHOD goTopBlock( bBlock ) CLASS TBROWSE
METHOD goTopBlock( bBlock ) CLASS TBrowse
IF bBlock != NIL
::bGoTopBlock := __eInstVar53( Self, "GOTOPBLOCK", bBlock, "B", 1001 )
@@ -2266,7 +2266,7 @@ METHOD goTopBlock( bBlock ) CLASS TBROWSE
RETURN ::bGoTopBlock
METHOD goBottomBlock( bBlock ) CLASS TBROWSE
METHOD goBottomBlock( bBlock ) CLASS TBrowse
IF bBlock != NIL
/* NOTE: In CA-Cl*pper the string is: "GOBOTTOMBL" */
@@ -2276,7 +2276,7 @@ METHOD goBottomBlock( bBlock ) CLASS TBROWSE
RETURN ::bGoBottomBlock
METHOD nTop( nTop ) CLASS TBROWSE
METHOD nTop( nTop ) CLASS TBrowse
IF nTop != NIL
#ifdef HB_COMPAT_C53
@@ -2299,7 +2299,7 @@ METHOD nTop( nTop ) CLASS TBROWSE
RETURN ::n_Top
METHOD nLeft( nLeft ) CLASS TBROWSE
METHOD nLeft( nLeft ) CLASS TBrowse
IF nLeft != NIL
#ifdef HB_COMPAT_C53
@@ -2322,7 +2322,7 @@ METHOD nLeft( nLeft ) CLASS TBROWSE
RETURN ::n_Left
METHOD nBottom( nBottom ) CLASS TBROWSE
METHOD nBottom( nBottom ) CLASS TBrowse
IF nBottom != NIL
::n_Bottom := __eInstVar53( Self, "NBOTTOM", nBottom, "N", 1001, {| o, x | x >= o:nTop } )
@@ -2343,7 +2343,7 @@ METHOD nBottom( nBottom ) CLASS TBROWSE
RETURN ::n_Bottom
METHOD nRight( nRight ) CLASS TBROWSE
METHOD nRight( nRight ) CLASS TBrowse
IF nRight != NIL
::n_Right := __eInstVar53( Self, "NRIGHT", nRight, "N", 1001, {| o, x | x >= o:nLeft } )
@@ -2364,7 +2364,7 @@ METHOD nRight( nRight ) CLASS TBROWSE
RETURN ::n_Right
#ifdef HB_COMPAT_C53
METHOD nRow() CLASS TBROWSE
METHOD nRow() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2373,7 +2373,7 @@ METHOD nRow() CLASS TBROWSE
RETURN ::n_Row
METHOD nCol() CLASS TBROWSE
METHOD nCol() CLASS TBrowse
IF ::nConfigure != 0
::doConfigure()
@@ -2382,7 +2382,7 @@ METHOD nCol() CLASS TBROWSE
RETURN ::n_Col
METHOD hitTest( mRow, mCol ) CLASS TBROWSE
METHOD hitTest( mRow, mCol ) CLASS TBrowse
LOCAL nTop, nLeft, nBottom, nRight, nRet, nCol
LOCAL lFirst
@@ -2538,7 +2538,7 @@ STATIC PROCEDURE _mBrwPos( oBrw, mRow, mCol )
RETURN
METHOD mRowPos() CLASS TBROWSE
METHOD mRowPos() CLASS TBrowse
LOCAL mRow, mCol
@@ -2551,7 +2551,7 @@ METHOD mRowPos() CLASS TBROWSE
RETURN mRow
METHOD mColPos() CLASS TBROWSE
METHOD mColPos() CLASS TBrowse
LOCAL mRow, mCol
@@ -2565,7 +2565,7 @@ METHOD mColPos() CLASS TBROWSE
#endif
METHOD border( cBorder ) CLASS TBROWSE
METHOD border( cBorder ) CLASS TBrowse
IF cBorder != NIL
@@ -2594,7 +2594,7 @@ METHOD border( cBorder ) CLASS TBROWSE
RETURN ::cBorder
METHOD message( cMessage ) CLASS TBROWSE
METHOD message( cMessage ) CLASS TBrowse
IF cMessage != NIL
::cMessage := __eInstVar53( Self, "MESSAGE", cMessage, "C", 1001 )
@@ -2603,7 +2603,7 @@ METHOD message( cMessage ) CLASS TBROWSE
RETURN ::cMessage
METHOD applyKey( nKey ) CLASS TBROWSE
METHOD applyKey( nKey ) CLASS TBrowse
LOCAL bBlock := ::SetKey( nKey )
@@ -2618,7 +2618,7 @@ METHOD applyKey( nKey ) CLASS TBROWSE
RETURN Eval( bBlock, Self, nKey )
METHOD setKey( nKey, bBlock ) CLASS TBROWSE
METHOD setKey( nKey, bBlock ) CLASS TBrowse
LOCAL bReturn
LOCAL nPos
@@ -2671,7 +2671,7 @@ METHOD setKey( nKey, bBlock ) CLASS TBROWSE
RETURN bReturn
METHOD setStyle( nStyle, lNewValue ) CLASS TBROWSE
METHOD setStyle( nStyle, lNewValue ) CLASS TBrowse
/* NOTE: CA-Cl*pper 5.3 will initialize this var on the first
:setStyle() method call. [vszakats] */

146
harbour/src/rtl/tget.prg
View File

@@ -69,7 +69,7 @@
/* NOTE: In CA-Cl*pper, TGET class does not inherit from any other classes. */
CREATE CLASS GET
CREATE CLASS Get
PROTECTED:
@@ -221,7 +221,7 @@ CREATE CLASS GET
ENDCLASS
METHOD assign() CLASS GET
METHOD assign() CLASS Get
LOCAL xValue
@@ -235,7 +235,7 @@ METHOD assign() CLASS GET
RETURN Self
METHOD updateBuffer() CLASS GET
METHOD updateBuffer() CLASS Get
IF ::hasFocus
::cBuffer := ::PutMask( ::varGet() )
@@ -247,7 +247,7 @@ METHOD updateBuffer() CLASS GET
RETURN Self
METHOD display() CLASS GET
METHOD display() CLASS Get
LOCAL nOldCursor := SetCursor( SC_NONE )
LOCAL cBuffer
@@ -362,14 +362,14 @@ METHOD display() CLASS GET
/* ------------------------------------------------------------------------- */
METHOD colorDisp( cColorSpec ) CLASS GET
METHOD colorDisp( cColorSpec ) CLASS Get
::colorSpec := cColorSpec
::display()
RETURN Self
METHOD end() CLASS GET
METHOD end() CLASS Get
LOCAL nLastCharPos
LOCAL nPos
@@ -396,7 +396,7 @@ METHOD end() CLASS GET
RETURN Self
METHOD home() CLASS GET
METHOD home() CLASS Get
IF ::hasFocus
::pos := ::FirstEditable()
@@ -408,7 +408,7 @@ METHOD home() CLASS GET
RETURN Self
METHOD reset() CLASS GET
METHOD reset() CLASS Get
IF ::hasFocus
::cBuffer := ::PutMask( ::varGet(), .F. )
@@ -425,7 +425,7 @@ METHOD reset() CLASS GET
RETURN Self
METHOD undo() CLASS GET
METHOD undo() CLASS Get
IF ::hasFocus
IF ::original != NIL
@@ -437,7 +437,7 @@ METHOD undo() CLASS GET
RETURN Self
METHOD setFocus() CLASS GET
METHOD setFocus() CLASS Get
LOCAL xVarGet
@@ -476,7 +476,7 @@ METHOD setFocus() CLASS GET
RETURN Self
METHOD killFocus() CLASS GET
METHOD killFocus() CLASS Get
LOCAL lHadFocus := ::hasFocus
@@ -498,7 +498,7 @@ METHOD killFocus() CLASS GET
RETURN Self
METHOD varPut( xValue ) CLASS GET
METHOD varPut( xValue ) CLASS Get
LOCAL aSubs
LOCAL nLen
@@ -531,7 +531,7 @@ METHOD varPut( xValue ) CLASS GET
RETURN xValue
METHOD varGet() CLASS GET
METHOD varGet() CLASS Get
LOCAL aSubs
LOCAL nLen
@@ -563,7 +563,7 @@ METHOD varGet() CLASS GET
/* NOTE: CA-Cl*pper will corrupt memory if cChar contains
multiple chars. [vszakats] */
METHOD overStrike( cChar ) CLASS GET
METHOD overStrike( cChar ) CLASS Get
IF ::hasFocus
@@ -614,7 +614,7 @@ METHOD overStrike( cChar ) CLASS GET
/* NOTE: CA-Cl*pper will corrupt memory if cChar contains
multiple chars. [vszakats] */
METHOD insert( cChar ) CLASS GET
METHOD insert( cChar ) CLASS Get
LOCAL nFor
LOCAL nMaxEdit
@@ -681,7 +681,7 @@ METHOD insert( cChar ) CLASS GET
RETURN Self
METHOD right() CLASS GET
METHOD right() CLASS Get
IF ::hasFocus .AND. ;
::rightLow()
@@ -692,7 +692,7 @@ METHOD right() CLASS GET
RETURN Self
METHOD left() CLASS GET
METHOD left() CLASS Get
IF ::hasFocus .AND. ;
::leftLow()
@@ -703,7 +703,7 @@ METHOD left() CLASS GET
RETURN Self
METHOD wordLeft() CLASS GET
METHOD wordLeft() CLASS Get
LOCAL nPos
@@ -734,7 +734,7 @@ METHOD wordLeft() CLASS GET
RETURN Self
METHOD wordRight() CLASS GET
METHOD wordRight() CLASS Get
LOCAL nPos
@@ -765,7 +765,7 @@ METHOD wordRight() CLASS GET
RETURN Self
METHOD toDecPos() CLASS GET
METHOD toDecPos() CLASS Get
IF ::hasFocus
@@ -787,7 +787,7 @@ METHOD toDecPos() CLASS GET
RETURN Self
METHOD backSpace() CLASS GET
METHOD backSpace() CLASS Get
IF ::hasFocus .AND. ;
::backSpaceLow()
@@ -797,7 +797,7 @@ METHOD backSpace() CLASS GET
RETURN Self
METHOD delete() CLASS GET
METHOD delete() CLASS Get
IF ::hasFocus
::deleteLow()
@@ -806,7 +806,7 @@ METHOD delete() CLASS GET
RETURN Self
METHOD delEnd() CLASS GET
METHOD delEnd() CLASS Get
LOCAL nPos
@@ -825,7 +825,7 @@ METHOD delEnd() CLASS GET
RETURN Self
METHOD delLeft() CLASS GET
METHOD delLeft() CLASS Get
::leftLow()
::deleteLow()
@@ -833,7 +833,7 @@ METHOD delLeft() CLASS GET
RETURN Self
METHOD delRight() CLASS GET
METHOD delRight() CLASS Get
::rightLow()
::deleteLow()
@@ -844,7 +844,7 @@ METHOD delRight() CLASS GET
/* ::wordLeft()
::delWordRight() */
METHOD delWordLeft() CLASS GET
METHOD delWordLeft() CLASS Get
IF ::hasFocus
@@ -870,7 +870,7 @@ METHOD delWordLeft() CLASS GET
RETURN Self
METHOD delWordRight() CLASS GET
METHOD delWordRight() CLASS Get
IF ::hasFocus
@@ -902,10 +902,10 @@ METHOD delWordRight() CLASS GET
* be used for GET_CLR_UNSELECTED and GET_CLR_ENHANCED.
*/
METHOD getColorSpec() CLASS GET
METHOD getColorSpec() CLASS Get
RETURN ::cColorSpec
METHOD setColorSpec( cColorSpec ) CLASS GET
METHOD setColorSpec( cColorSpec ) CLASS Get
LOCAL nClrUns
LOCAL nClrOth
@@ -949,10 +949,10 @@ METHOD setColorSpec( cColorSpec ) CLASS GET
RETURN cColorSpec
METHOD getPos() CLASS GET
METHOD getPos() CLASS Get
RETURN ::nPos
METHOD setPos( nPos ) CLASS GET
METHOD setPos( nPos ) CLASS Get
LOCAL tmp
@@ -1007,7 +1007,7 @@ METHOD setPos( nPos ) CLASS GET
* several tasks to adjust the internal data of the object.
*/
METHOD picture( cPicture ) CLASS GET
METHOD picture( cPicture ) CLASS Get
LOCAL nAt
LOCAL nFor
@@ -1153,7 +1153,7 @@ METHOD picture( cPicture ) CLASS GET
RETURN ::cPicture
METHOD PutMask( xValue, lEdit ) CLASS GET
METHOD PutMask( xValue, lEdit ) CLASS Get
LOCAL cChar
LOCAL cBuffer
@@ -1235,7 +1235,7 @@ METHOD PutMask( xValue, lEdit ) CLASS GET
RETURN cBuffer
METHOD unTransform() CLASS GET
METHOD unTransform() CLASS Get
LOCAL cBuffer
LOCAL xValue
@@ -1380,7 +1380,7 @@ METHOD unTransform() CLASS GET
RETURN xValue
METHOD type() CLASS GET
METHOD type() CLASS Get
RETURN ::cType := ValType( iif( ::hasFocus, ::xVarGet, ::varGet() ) )
@@ -1393,7 +1393,7 @@ METHOD type() CLASS GET
* to display correctly.
*/
METHOD block( bBlock ) CLASS GET
METHOD block( bBlock ) CLASS Get
IF PCount() == 0 .OR. bBlock == NIL
RETURN ::bBlock
@@ -1405,7 +1405,7 @@ METHOD block( bBlock ) CLASS GET
RETURN bBlock
METHOD firstEditable() CLASS GET
METHOD firstEditable() CLASS Get
LOCAL nFor
@@ -1425,7 +1425,7 @@ METHOD firstEditable() CLASS GET
RETURN 0
METHOD lastEditable() CLASS GET
METHOD lastEditable() CLASS Get
LOCAL nFor
@@ -1441,7 +1441,7 @@ METHOD lastEditable() CLASS GET
RETURN 0
METHOD badDate() CLASS GET
METHOD badDate() CLASS Get
LOCAL xValue
@@ -1460,7 +1460,7 @@ METHOD badDate() CLASS GET
#ifdef HB_CLP_UNDOC
METHOD reform() CLASS GET
METHOD reform() CLASS Get
IF ::hasFocus
::cBuffer := ::PutMask( ::unTransform(), .F. )
@@ -1473,7 +1473,7 @@ METHOD reform() CLASS GET
#ifdef HB_COMPAT_C53
METHOD hitTest( nMRow, nMCol ) CLASS GET
METHOD hitTest( nMRow, nMCol ) CLASS Get
IF HB_ISOBJECT( ::oControl )
RETURN ::oControl:hitTest( nMRow, nMCol )
@@ -1492,7 +1492,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS GET
RETURN HTNOWHERE
METHOD control( oControl ) CLASS GET
METHOD control( oControl ) CLASS Get
IF PCount() == 1 .AND. ( oControl == NIL .OR. HB_ISOBJECT( oControl ) )
::oControl := oControl
@@ -1500,7 +1500,7 @@ METHOD control( oControl ) CLASS GET
RETURN ::oControl
METHOD caption( cCaption ) CLASS GET
METHOD caption( cCaption ) CLASS Get
IF HB_ISSTRING( cCaption )
::cCaption := cCaption
@@ -1508,7 +1508,7 @@ METHOD caption( cCaption ) CLASS GET
RETURN ::cCaption
METHOD capRow( nCapRow ) CLASS GET
METHOD capRow( nCapRow ) CLASS Get
IF HB_ISNUMERIC( nCapRow )
::nCapRow := Int( nCapRow )
@@ -1516,7 +1516,7 @@ METHOD capRow( nCapRow ) CLASS GET
RETURN ::nCapRow
METHOD capCol( nCapCol ) CLASS GET
METHOD capCol( nCapCol ) CLASS Get
IF HB_ISNUMERIC( nCapCol )
::nCapCol := Int( nCapCol )
@@ -1524,7 +1524,7 @@ METHOD capCol( nCapCol ) CLASS GET
RETURN ::nCapCol
METHOD message( cMessage ) CLASS GET
METHOD message( cMessage ) CLASS Get
IF HB_ISSTRING( cMessage )
::cMessage := cMessage
@@ -1536,7 +1536,7 @@ METHOD message( cMessage ) CLASS GET
/* ------------------------------------------------------------------------- */
METHOD rightLow() CLASS GET
METHOD rightLow() CLASS Get
LOCAL nPos
@@ -1562,7 +1562,7 @@ METHOD rightLow() CLASS GET
RETURN .T.
METHOD leftLow() CLASS GET
METHOD leftLow() CLASS Get
LOCAL nPos
@@ -1588,7 +1588,7 @@ METHOD leftLow() CLASS GET
RETURN .T.
METHOD backSpaceLow() CLASS GET
METHOD backSpaceLow() CLASS Get
LOCAL nMinus
LOCAL nPos := ::nPos
@@ -1620,7 +1620,7 @@ METHOD backSpaceLow() CLASS GET
RETURN .F.
METHOD deleteLow() CLASS GET
METHOD deleteLow() CLASS Get
LOCAL nMaxLen := ::nMaxLen
LOCAL n
@@ -1650,7 +1650,7 @@ METHOD deleteLow() CLASS GET
RETURN NIL
METHOD DeleteAll() CLASS GET
METHOD DeleteAll() CLASS Get
LOCAL xValue
@@ -1678,7 +1678,7 @@ METHOD DeleteAll() CLASS GET
RETURN Self
METHOD IsEditable( nPos ) CLASS GET
METHOD IsEditable( nPos ) CLASS Get
LOCAL cChar
@@ -1708,7 +1708,7 @@ METHOD IsEditable( nPos ) CLASS GET
RETURN .F.
METHOD Input( cChar ) CLASS GET
METHOD Input( cChar ) CLASS Get
LOCAL cPic
@@ -1817,18 +1817,18 @@ METHOD Input( cChar ) CLASS GET
/* ------------------------------------------------------------------------- */
METHOD getBuffer() CLASS GET
METHOD getBuffer() CLASS Get
RETURN ::cBuffer
METHOD setBuffer( cBuffer ) CLASS GET
METHOD setBuffer( cBuffer ) CLASS Get
RETURN iif( ::hasFocus, ::cBuffer := cBuffer, cBuffer )
/* NOTE: In contrary to CA-Cl*pper docs, this var is assignable. [vszakats] */
METHOD getChanged() CLASS GET
METHOD getChanged() CLASS Get
RETURN ::lChanged
METHOD setChanged( lChanged ) CLASS GET
METHOD setChanged( lChanged ) CLASS Get
IF HB_ISLOGICAL( lChanged )
RETURN iif( ::hasFocus, ::lChanged := lChanged, lChanged )
@@ -1836,10 +1836,10 @@ METHOD setChanged( lChanged ) CLASS GET
RETURN .F.
METHOD getClear() CLASS GET
METHOD getClear() CLASS Get
RETURN ::lClear
METHOD setClear( lClear ) CLASS GET
METHOD setClear( lClear ) CLASS Get
IF HB_ISLOGICAL( lClear )
RETURN iif( ::hasFocus, ::lClear := lClear, lClear )
@@ -1847,10 +1847,10 @@ METHOD setClear( lClear ) CLASS GET
RETURN .F.
METHOD getMinus() CLASS GET
METHOD getMinus() CLASS Get
RETURN ::lMinus
METHOD setMinus( lMinus ) CLASS GET
METHOD setMinus( lMinus ) CLASS Get
IF HB_ISLOGICAL( lMinus )
RETURN iif( ::hasFocus, ::lMinus := lMinus, lMinus )
@@ -1861,22 +1861,22 @@ METHOD setMinus( lMinus ) CLASS GET
/* NOTE: CA-Cl*pper has a bug where negative nRow value will be translated to 16bit unsigned int,
so the behaviour will be different in this case. [vszakats] */
METHOD getRow() CLASS GET
METHOD getRow() CLASS Get
RETURN ::nRow
METHOD setRow( nRow ) CLASS GET
METHOD setRow( nRow ) CLASS Get
RETURN ::nRow := iif( HB_ISNUMERIC( nRow ), Int( nRow ), 0 )
/* NOTE: CA-Cl*pper has a bug where negative nCol value will be translated to 16bit unsigned int,
so the behaviour will be different in this case. [vszakats] */
METHOD getCol() CLASS GET
METHOD getCol() CLASS Get
RETURN ::nCol
METHOD setCol( nCol ) CLASS GET
METHOD setCol( nCol ) CLASS Get
RETURN ::nCol := iif( HB_ISNUMERIC( nCol ), Int( nCol ), 0 )
METHOD name( cName ) CLASS GET
METHOD name( cName ) CLASS Get
IF PCount() > 0 .AND. cName != NIL
::cName := cName
@@ -1884,7 +1884,7 @@ METHOD name( cName ) CLASS GET
RETURN ::cName
METHOD SubScript( xValue ) CLASS GET
METHOD SubScript( xValue ) CLASS Get
IF xValue != NIL
::xSubScript := xValue
@@ -1892,7 +1892,7 @@ METHOD SubScript( xValue ) CLASS GET
RETURN ::xSubScript
METHOD PostBlock( xValue ) CLASS GET
METHOD PostBlock( xValue ) CLASS Get
IF xValue != NIL
::bPostBlock := xValue
@@ -1900,7 +1900,7 @@ METHOD PostBlock( xValue ) CLASS GET
RETURN ::bPostBlock
METHOD PreBlock( xValue ) CLASS GET
METHOD PreBlock( xValue ) CLASS Get
IF xValue != NIL
::bPreBlock := xValue
@@ -1908,7 +1908,7 @@ METHOD PreBlock( xValue ) CLASS GET
RETURN ::bPreBlock
METHOD Cargo( xValue ) CLASS GET
METHOD Cargo( xValue ) CLASS Get
IF xValue != NIL
::xCargo := xValue
@@ -1916,7 +1916,7 @@ METHOD Cargo( xValue ) CLASS GET
RETURN ::xCargo
METHOD ExitState( xValue ) CLASS GET
METHOD ExitState( xValue ) CLASS Get
IF xValue != NIL
::xExitState := xValue
@@ -1924,7 +1924,7 @@ METHOD ExitState( xValue ) CLASS GET
RETURN ::xExitState
METHOD Reader( xValue ) CLASS GET
METHOD Reader( xValue ) CLASS Get
IF xValue != NIL
::bReader := xValue
@@ -1934,7 +1934,7 @@ METHOD Reader( xValue ) CLASS GET
/* ------------------------------------------------------------------------- */
METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS GET
METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get
IF nRow == NIL
nRow := Row()

24
harbour/src/rtl/tmenuitm.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* MENUITEM class
* MenuItem class
*
* Copyright 2000 Jose Lalin <dezac@corevia.com>
* www - http://harbour-project.org
@@ -59,7 +59,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS MENUITEM FUNCTION HBMenuItem
CREATE CLASS MenuItem FUNCTION HBMenuItem
EXPORTED:
@@ -94,7 +94,7 @@ CREATE CLASS MENUITEM FUNCTION HBMenuItem
ENDCLASS
METHOD caption( cCaption ) CLASS MENUITEM
METHOD caption( cCaption ) CLASS MenuItem
IF cCaption != NIL
@@ -111,7 +111,7 @@ METHOD caption( cCaption ) CLASS MENUITEM
RETURN ::cCaption
METHOD checked( lChecked ) CLASS MENUITEM
METHOD checked( lChecked ) CLASS MenuItem
// ; TOFIX: HB_MENU_SEPARATOR_UNI is dynamic value, so it's not good
// to use it for flag purposes.
@@ -121,7 +121,7 @@ METHOD checked( lChecked ) CLASS MENUITEM
RETURN ::lChecked
METHOD data( boData ) CLASS MENUITEM
METHOD data( boData ) CLASS MenuItem
IF boData != NIL
IF HB_ISBLOCK( boData )
@@ -133,7 +133,7 @@ METHOD data( boData ) CLASS MENUITEM
RETURN ::boData
METHOD enabled( lEnabled ) CLASS MENUITEM
METHOD enabled( lEnabled ) CLASS MenuItem
// ; TOFIX: HB_MENU_SEPARATOR_UNI is dynamic value, so it's not good
// to use it for flag purposes.
@@ -143,7 +143,7 @@ METHOD enabled( lEnabled ) CLASS MENUITEM
RETURN ::lEnabled
METHOD id( nID ) CLASS MENUITEM
METHOD id( nID ) CLASS MenuItem
IF nID != NIL
::nID := __eInstVar53( Self, "ID", nID, "N", 1001 )
@@ -151,7 +151,7 @@ METHOD id( nID ) CLASS MENUITEM
RETURN ::nID
METHOD message( cMessage ) CLASS MENUITEM
METHOD message( cMessage ) CLASS MenuItem
IF cMessage != NIL
::cMessage := __eInstVar53( Self, "MESSAGE", cMessage, "C", 1001 )
@@ -159,7 +159,7 @@ METHOD message( cMessage ) CLASS MENUITEM
RETURN ::cMessage
METHOD shortcut( nShortcut ) CLASS MENUITEM
METHOD shortcut( nShortcut ) CLASS MenuItem
IF nShortcut != NIL
::nShortcut := __eInstVar53( Self, "SHORTCUT", nShortcut, "N", 1001 )
@@ -167,7 +167,7 @@ METHOD shortcut( nShortcut ) CLASS MENUITEM
RETURN ::nShortcut
METHOD style( cStyle ) CLASS MENUITEM
METHOD style( cStyle ) CLASS MenuItem
IF cStyle != NIL
::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 2 } )
@@ -175,10 +175,10 @@ METHOD style( cStyle ) CLASS MENUITEM
RETURN ::cStyle
METHOD isPopUp() CLASS MENUITEM
METHOD isPopUp() CLASS MenuItem
RETURN HB_ISOBJECT( ::data ) .AND. ::data:ClassName() $ "POPUPMENU|HB_POPUPMENU"
METHOD New( cCaption, boData, nShortcut, cMessage, nID ) CLASS MENUITEM
METHOD New( cCaption, boData, nShortcut, cMessage, nID ) CLASS MenuItem
hb_default( @nShortcut, 0 )
hb_default( @cMessage, "" )

60
harbour/src/rtl/tpopup.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* POPUP menu class
* Popup menu class
*
* Copyright 2000 Jose Lalin <dezac@corevia.com>
* www - http://harbour-project.org
@@ -65,7 +65,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS POPUPMENU FUNCTION HBPopUpMenu
CREATE CLASS PopupMenu FUNCTION HBPopupMenu
EXPORTED:
@@ -122,7 +122,7 @@ CREATE CLASS POPUPMENU FUNCTION HBPopUpMenu
ENDCLASS
METHOD addItem( oItem ) CLASS POPUPMENU
METHOD addItem( oItem ) CLASS PopupMenu
IF HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM"
@@ -135,7 +135,7 @@ METHOD addItem( oItem ) CLASS POPUPMENU
RETURN Self
METHOD close( lCloseChild ) CLASS POPUPMENU
METHOD close( lCloseChild ) CLASS PopupMenu
__defaultNIL( @lCloseChild, .T. )
@@ -158,7 +158,7 @@ METHOD close( lCloseChild ) CLASS POPUPMENU
RETURN Self
METHOD delItem( nPos ) CLASS POPUPMENU
METHOD delItem( nPos ) CLASS PopupMenu
LOCAL nLen
LOCAL aItems
@@ -184,7 +184,7 @@ METHOD delItem( nPos ) CLASS POPUPMENU
RETURN Self
METHOD display() CLASS POPUPMENU
METHOD display() CLASS PopupMenu
LOCAL nTop
LOCAL nLeft
@@ -282,7 +282,7 @@ METHOD display() CLASS POPUPMENU
RETURN Self
METHOD getAccel( xKey ) CLASS POPUPMENU
METHOD getAccel( xKey ) CLASS PopupMenu
LOCAL cKey
LOCAL item
@@ -306,7 +306,7 @@ METHOD getAccel( xKey ) CLASS POPUPMENU
RETURN 0
METHOD getFirst() CLASS POPUPMENU
METHOD getFirst() CLASS PopupMenu
LOCAL nPos
LOCAL nLen := ::nItemCount
@@ -320,10 +320,10 @@ METHOD getFirst() CLASS POPUPMENU
RETURN 0
METHOD getItem( nPos ) CLASS POPUPMENU
METHOD getItem( nPos ) CLASS PopupMenu
RETURN iif( nPos >= 1 .AND. nPos <= ::nItemCount, ::aItems[ nPos ], NIL )
METHOD getLast() CLASS POPUPMENU
METHOD getLast() CLASS PopupMenu
LOCAL nPos
LOCAL nLen := ::nItemCount
@@ -337,7 +337,7 @@ METHOD getLast() CLASS POPUPMENU
RETURN 0
METHOD getNext() CLASS POPUPMENU
METHOD getNext() CLASS PopupMenu
LOCAL nPos
@@ -351,7 +351,7 @@ METHOD getNext() CLASS POPUPMENU
RETURN 0
METHOD getPrev() CLASS POPUPMENU
METHOD getPrev() CLASS PopupMenu
LOCAL nPos
@@ -368,7 +368,7 @@ METHOD getPrev() CLASS POPUPMENU
/* NOTE: This method corrects a bug in Cl*pper:
1) when a menuitem is disabled it will ignore the key [jlalin] */
METHOD getShortCt( nKey ) CLASS POPUPMENU
METHOD getShortCt( nKey ) CLASS PopupMenu
LOCAL nPos
LOCAL nLen := ::nItemCount
@@ -385,7 +385,7 @@ METHOD getShortCt( nKey ) CLASS POPUPMENU
/* NOTE: This method corrects one bug in CA-Cl*pper:
1) when a menuitem is disabled it will ignore the click [jlalin] */
METHOD hitTest( nMRow, nMCol ) CLASS POPUPMENU
METHOD hitTest( nMRow, nMCol ) CLASS PopupMenu
LOCAL nPos
@@ -438,7 +438,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS POPUPMENU
RETURN HTNOWHERE
METHOD insItem( nPos, oItem ) CLASS POPUPMENU
METHOD insItem( nPos, oItem ) CLASS PopupMenu
IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM"
@@ -453,10 +453,10 @@ METHOD insItem( nPos, oItem ) CLASS POPUPMENU
RETURN Self
METHOD isOpen() CLASS POPUPMENU
METHOD isOpen() CLASS PopupMenu
RETURN ::aSaveScr != NIL
METHOD open() CLASS POPUPMENU
METHOD open() CLASS PopupMenu
LOCAL nTop
LOCAL nLeft
@@ -494,7 +494,7 @@ METHOD open() CLASS POPUPMENU
RETURN Self
METHOD select( nPos ) CLASS POPUPMENU
METHOD select( nPos ) CLASS PopupMenu
IF ( nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
::nCurrent != nPos .AND. ;
@@ -514,7 +514,7 @@ METHOD select( nPos ) CLASS POPUPMENU
RETURN Self
METHOD setItem( nPos, oItem ) CLASS POPUPMENU
METHOD setItem( nPos, oItem ) CLASS PopupMenu
IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM"
@@ -525,7 +525,7 @@ METHOD setItem( nPos, oItem ) CLASS POPUPMENU
RETURN Self /* NOTE: CA-Cl*pper returns NIL, which is wrong. */
METHOD setMetrics() CLASS POPUPMENU
METHOD setMetrics() CLASS PopupMenu
IF ::nTop != NIL
ELSEIF ::nBottom == NIL
@@ -546,7 +546,7 @@ METHOD setMetrics() CLASS POPUPMENU
RETURN Self
METHOD border( cBorder ) CLASS POPUPMENU
METHOD border( cBorder ) CLASS PopupMenu
IF cBorder != NIL
::cBorder := __eInstVar53( Self, "BORDER", cBorder, "C", 1001, {|| Len( cBorder ) == 0 .OR. Len( cBorder ) == 11 } )
@@ -554,7 +554,7 @@ METHOD border( cBorder ) CLASS POPUPMENU
RETURN ::cBorder
METHOD bottom( nBottom ) CLASS POPUPMENU
METHOD bottom( nBottom ) CLASS PopupMenu
#ifdef HB_CLP_STRICT
IF nBottom != NIL
@@ -568,7 +568,7 @@ METHOD bottom( nBottom ) CLASS POPUPMENU
RETURN ::nBottom
METHOD colorSpec( cColorSpec ) CLASS POPUPMENU
METHOD colorSpec( cColorSpec ) CLASS PopupMenu
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001, ;
@@ -577,13 +577,13 @@ METHOD colorSpec( cColorSpec ) CLASS POPUPMENU
RETURN ::cColorSpec
METHOD current() CLASS POPUPMENU
METHOD current() CLASS PopupMenu
RETURN ::nCurrent
METHOD itemCount() CLASS POPUPMENU
METHOD itemCount() CLASS PopupMenu
RETURN ::nItemCount
METHOD left( nLeft ) CLASS POPUPMENU
METHOD left( nLeft ) CLASS PopupMenu
#ifdef HB_CLP_STRICT
IF nLeft != NIL
@@ -597,7 +597,7 @@ METHOD left( nLeft ) CLASS POPUPMENU
RETURN ::nLeft
METHOD right( nRight ) CLASS POPUPMENU
METHOD right( nRight ) CLASS PopupMenu
#ifdef HB_CLP_STRICT
IF nRight != NIL
@@ -611,7 +611,7 @@ METHOD right( nRight ) CLASS POPUPMENU
RETURN ::nRight
METHOD top( nTop ) CLASS POPUPMENU
METHOD top( nTop ) CLASS PopupMenu
#ifdef HB_CLP_STRICT
IF nTop != NIL
@@ -625,10 +625,10 @@ METHOD top( nTop ) CLASS POPUPMENU
RETURN ::nTop
METHOD width() CLASS POPUPMENU
METHOD width() CLASS PopupMenu
RETURN ::nWidth
METHOD New( nTop, nLeft, nBottom, nRight ) CLASS POPUPMENU
METHOD New( nTop, nLeft, nBottom, nRight ) CLASS PopupMenu
LOCAL cColor

10
harbour/src/rtl/tpopuphb.prg
View File

@@ -55,7 +55,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS hb_POPUPMENU INHERIT hbPOPUPMENU
CREATE CLASS hb_PopupMenu INHERIT HBPopupMenu
EXPORTED:
@@ -67,7 +67,7 @@ CREATE CLASS hb_POPUPMENU INHERIT hbPOPUPMENU
ENDCLASS
METHOD shadowed( lShadowed ) CLASS hb_POPUPMENU
METHOD shadowed( lShadowed ) CLASS hb_PopupMenu
IF lShadowed != NIL
::lShadowed := __eInstVar53( Self, "SHADOWED", lShadowed, "L", 1001 )
@@ -75,7 +75,7 @@ METHOD shadowed( lShadowed ) CLASS hb_POPUPMENU
RETURN ::lShadowed
METHOD setCoors( nRow, nCol, lTop ) CLASS hb_POPUPMENU
METHOD setCoors( nRow, nCol, lTop ) CLASS hb_PopupMenu
LOCAL oItem
LOCAL nDif
@@ -125,7 +125,7 @@ METHOD setCoors( nRow, nCol, lTop ) CLASS hb_POPUPMENU
RETURN Self
METHOD isShortCut( nKey, nID ) CLASS hb_POPUPMENU
METHOD isShortCut( nKey, nID ) CLASS hb_PopupMenu
LOCAL nItem
LOCAL nTotal
@@ -169,7 +169,7 @@ METHOD isShortCut( nKey, nID ) CLASS hb_POPUPMENU
RETURN .F.
METHOD isQuick( nKey, nID ) CLASS hb_POPUPMENU
METHOD isQuick( nKey, nID ) CLASS hb_PopupMenu
LOCAL nItem
LOCAL nTotal

46
harbour/src/rtl/ttopbar.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* TOPBAR menu class
* TopBar menu class
*
* Copyright 2000 Jose Lalin <dezac@corevia.com>
* www - http://harbour-project.org
@@ -61,7 +61,7 @@
#ifdef HB_COMPAT_C53
CREATE CLASS TOPBARMENU FUNCTION HBTopBarMenu
CREATE CLASS TopBarMenu FUNCTION HBTopBarMenu
EXPORTED:
@@ -105,7 +105,7 @@ CREATE CLASS TOPBARMENU FUNCTION HBTopBarMenu
ENDCLASS
METHOD addItem( oItem ) CLASS TOPBARMENU
METHOD addItem( oItem ) CLASS TopBarMenu
IF HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM"
@@ -117,7 +117,7 @@ METHOD addItem( oItem ) CLASS TOPBARMENU
RETURN Self
METHOD delItem( nPos ) CLASS TOPBARMENU
METHOD delItem( nPos ) CLASS TopBarMenu
LOCAL nLen
LOCAL aItems
@@ -143,7 +143,7 @@ METHOD delItem( nPos ) CLASS TOPBARMENU
RETURN Self
METHOD display() CLASS TOPBARMENU
METHOD display() CLASS TopBarMenu
LOCAL nRow := ::nRow
LOCAL nLeft := ::nLeft
@@ -221,7 +221,7 @@ METHOD display() CLASS TOPBARMENU
RETURN Self
METHOD getFirst() CLASS TOPBARMENU
METHOD getFirst() CLASS TopBarMenu
LOCAL n
@@ -233,10 +233,10 @@ METHOD getFirst() CLASS TOPBARMENU
RETURN 0
METHOD getItem( nPos ) CLASS TOPBARMENU
METHOD getItem( nPos ) CLASS TopBarMenu
RETURN iif( nPos >= 1 .AND. nPos <= ::nItemCount, ::aItems[ nPos ], NIL )
METHOD getLast() CLASS TOPBARMENU
METHOD getLast() CLASS TopBarMenu
LOCAL n
@@ -248,7 +248,7 @@ METHOD getLast() CLASS TOPBARMENU
RETURN 0
METHOD getNext() CLASS TOPBARMENU
METHOD getNext() CLASS TopBarMenu
LOCAL n
@@ -262,7 +262,7 @@ METHOD getNext() CLASS TOPBARMENU
RETURN 0
METHOD getPrev() CLASS TOPBARMENU
METHOD getPrev() CLASS TopBarMenu
LOCAL n
@@ -281,7 +281,7 @@ METHOD getPrev() CLASS TOPBARMENU
first item is disabled
2) when a menuitem is disabled it will ignore the key [jlalin] */
METHOD getAccel( nKey ) CLASS TOPBARMENU
METHOD getAccel( nKey ) CLASS TopBarMenu
LOCAL nIndex := AScan( { ;
K_ALT_A, K_ALT_B, K_ALT_C, K_ALT_D, K_ALT_E, K_ALT_F, ;
@@ -305,7 +305,7 @@ METHOD getAccel( nKey ) CLASS TOPBARMENU
RETURN 0
METHOD getShortCt( nKey ) CLASS TOPBARMENU
METHOD getShortCt( nKey ) CLASS TopBarMenu
LOCAL n
@@ -324,7 +324,7 @@ METHOD getShortCt( nKey ) CLASS TOPBARMENU
This method correct a bug in Cl*pper:
when click on a disabled menuitem it will ignore it [jlalin] */
METHOD hitTest( nMRow, nMCol ) CLASS TOPBARMENU
METHOD hitTest( nMRow, nMCol ) CLASS TopBarMenu
LOCAL aItems
LOCAL nColumn
@@ -346,7 +346,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS TOPBARMENU
RETURN HTNOWHERE
METHOD insItem( nPos, oItem ) CLASS TOPBARMENU
METHOD insItem( nPos, oItem ) CLASS TopBarMenu
IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM"
@@ -360,7 +360,7 @@ METHOD insItem( nPos, oItem ) CLASS TOPBARMENU
RETURN Self
METHOD select( nPos ) CLASS TOPBARMENU
METHOD select( nPos ) CLASS TopBarMenu
IF ( nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
::nCurrent != nPos .AND. ;
@@ -380,7 +380,7 @@ METHOD select( nPos ) CLASS TOPBARMENU
RETURN Self
METHOD setItem( nPos, oItem ) CLASS TOPBARMENU
METHOD setItem( nPos, oItem ) CLASS TopBarMenu
IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ;
HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM"
@@ -392,7 +392,7 @@ METHOD setItem( nPos, oItem ) CLASS TOPBARMENU
RETURN Self
METHOD colorSpec( cColorSpec ) CLASS TOPBARMENU
METHOD colorSpec( cColorSpec ) CLASS TopBarMenu
IF cColorSpec != NIL
::cColorSpec := __eInstVar53( Self, "COLORSPEC", cColorSpec, "C", 1001,;
@@ -401,13 +401,13 @@ METHOD colorSpec( cColorSpec ) CLASS TOPBARMENU
RETURN ::cColorSpec
METHOD current() CLASS TOPBARMENU
METHOD current() CLASS TopBarMenu
RETURN ::nCurrent
METHOD itemCount() CLASS TOPBARMENU
METHOD itemCount() CLASS TopBarMenu
RETURN ::nItemCount
METHOD left( nLeft ) CLASS TOPBARMENU
METHOD left( nLeft ) CLASS TopBarMenu
IF nLeft != NIL
::nLeft := __eInstVar53( Self, "LEFT", nLeft, "N", 1001 )
@@ -415,7 +415,7 @@ METHOD left( nLeft ) CLASS TOPBARMENU
RETURN ::nLeft
METHOD right( nRight ) CLASS TOPBARMENU
METHOD right( nRight ) CLASS TopBarMenu
IF nRight != NIL
::nRight := __eInstVar53( Self, "RIGHT", nRight, "N", 1001 )
@@ -423,7 +423,7 @@ METHOD right( nRight ) CLASS TOPBARMENU
RETURN ::nRight
METHOD row( nRow ) CLASS TOPBARMENU
METHOD row( nRow ) CLASS TopBarMenu
IF nRow != NIL
/* NOTE: CA-Cl*pper 5.3 has a bug, where it would show "TOP" in case of an error. */
@@ -434,7 +434,7 @@ METHOD row( nRow ) CLASS TOPBARMENU
/* -------------------------------------------- */
METHOD New( nRow, nLeft, nRight ) CLASS TOPBARMENU
METHOD New( nRow, nLeft, nRight ) CLASS TopBarMenu
LOCAL cColor