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

2023-04-20 15:12 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/gtqtc/gtqtc1.cpp
    % minor optimization in HB_GTI_PALETTE

  * 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/teditor.prg
  * src/rtl/tget.prg
  * src/rtl/tgetlist.prg
  * src/rtl/tlabel.prg
  * src/rtl/tmenuitm.prg
  * src/rtl/tmenusys.prg
  * src/rtl/tpopup.prg
  * src/rtl/treport.prg
  * src/rtl/tsymbol.prg
  * src/rtl/ttextlin.prg
  * src/rtl/ttopbar.prg
    ! use :Init() method instead of :New() to initialize object instance
      variables. In Class(y) :New() is class message not object one.
This commit is contained in:
Przemysław Czerpak
2023-04-20 15:12:07 +02:00
parent b7b69eb00e
commit e11ee84e6a
21 changed files with 87 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog.txt
View File

@@ -7,6 +7,32 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */
2023-04-20 15:12 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/gtqtc/gtqtc1.cpp
% minor optimization in HB_GTI_PALETTE
* 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/teditor.prg
* src/rtl/tget.prg
* src/rtl/tgetlist.prg
* src/rtl/tlabel.prg
* src/rtl/tmenuitm.prg
* src/rtl/tmenusys.prg
* src/rtl/tpopup.prg
* src/rtl/treport.prg
* src/rtl/tsymbol.prg
* src/rtl/ttextlin.prg
* src/rtl/ttopbar.prg
! use :Init() method instead of :New() to initialize object instance
variables. In Class(y) :New() is class message not object one.
2023-03-09 15:50 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbvm.h
* src/harbour.def

19
contrib/gtqtc/gtqtc1.cpp
View File

@@ -2396,6 +2396,9 @@ static HB_BOOL hb_gt_qtc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
}
case HB_GTI_PALETTE:
{
HB_BOOL fExpose = HB_FALSE;
if( pInfo->pNewVal && HB_IS_NUMERIC( pInfo->pNewVal ) )
{
iVal = hb_itemGetNI( pInfo->pNewVal );
@@ -2410,8 +2413,7 @@ static HB_BOOL hb_gt_qtc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( rgb != pQTC->colors[ iVal ] )
{
pQTC->colors[ iVal ] = rgb;
if( pQTC->qWnd )
HB_GTSELF_EXPOSEAREA( pQTC->pGT, 0, 0, pQTC->iRows, pQTC->iCols );
fExpose = HB_TRUE;
}
}
}
@@ -2430,14 +2432,19 @@ static HB_BOOL hb_gt_qtc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
for( iVal = 0; iVal < 16; iVal++ )
{
int iColor = hb_arrayGetNI( pInfo->pNewVal, iVal + 1 );
pQTC->colors[ iVal ] = QTC_NUM2RGB( iColor );
QRgb rgb = QTC_NUM2RGB( iColor );
if( rgb != pQTC->colors[ iVal ] )
{
pQTC->colors[ iVal ] = rgb;
fExpose = HB_TRUE;
}
}
if( pQTC->qWnd )
HB_GTSELF_EXPOSEAREA( pQTC->pGT, 0, 0, pQTC->iRows, pQTC->iCols );
}
}
if( fExpose && pQTC->qWnd )
HB_GTSELF_EXPOSEAREA( pQTC->pGT, 0, 0, pQTC->iRows, pQTC->iCols );
break;
}
case HB_GTI_WINHANDLE:
pInfo->pResult = hb_itemPutPtr( pInfo->pResult, pQTC->qWnd );
break;

4
src/rtl/checkbox.prg
View File

@@ -86,7 +86,7 @@ CREATE CLASS CheckBox FUNCTION HBCheckBox
METHOD style( cStyle ) SETGET
METHOD typeOut() SETGET
METHOD New( nRow, nCol, cCaption ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nRow, nCol, cCaption ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -318,7 +318,7 @@ METHOD style( cStyle ) CLASS CheckBox
METHOD typeOut() CLASS CheckBox
RETURN .F.
METHOD New( nRow, nCol, cCaption ) CLASS CheckBox
METHOD Init( nRow, nCol, cCaption ) CLASS CheckBox
LOCAL cColor

4
src/rtl/listbox.prg
View File

@@ -150,7 +150,7 @@ CREATE CLASS ListBox FUNCTION HBListBox
METHOD value() SETGET /* NOTE: Undocumented CA-Cl*pper method. */
METHOD vScroll( oVScroll ) SETGET
METHOD New( nTop, nLeft, nBottom, nRight, lDropDown ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nTop, nLeft, nBottom, nRight, lDropDown ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -1047,7 +1047,7 @@ METHOD vScroll( oVScroll ) CLASS ListBox
/* --- */
METHOD New( nTop, nLeft, nBottom, nRight, lDropDown ) CLASS ListBox
METHOD Init( nTop, nLeft, nBottom, nRight, lDropDown ) CLASS ListBox
LOCAL cColor

4
src/rtl/pushbtn.prg
View File

@@ -91,7 +91,7 @@ CREATE CLASS PushButton FUNCTION HBPushButton
METHOD typeOut() SETGET
METHOD style( cStyle ) SETGET
METHOD New( nRow, nCol, cCaption ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nRow, nCol, cCaption ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -331,7 +331,7 @@ METHOD style( cStyle ) CLASS PushButton
RETURN ::cStyle
METHOD New( nRow, nCol, cCaption ) CLASS PushButton
METHOD Init( nRow, nCol, cCaption ) CLASS PushButton
LOCAL cColor

4
src/rtl/radiobtn.prg
View File

@@ -85,7 +85,7 @@ CREATE CLASS RadioButtn FUNCTION HBRadioButton
METHOD sBlock( bSBlock ) SETGET
METHOD style( cStyle ) SETGET
METHOD New( nRow, nCol, cCaption, cData ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nRow, nCol, cCaption, cData ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -315,7 +315,7 @@ METHOD style( cStyle ) CLASS RadioButtn
RETURN ::cStyle
METHOD New( nRow, nCol, cCaption, cData ) CLASS RadioButtn
METHOD Init( nRow, nCol, cCaption, cData ) CLASS RadioButtn
LOCAL cColor

4
src/rtl/radiogrp.prg
View File

@@ -100,7 +100,7 @@ CREATE CLASS RadioGroup FUNCTION HBRadioGroup
METHOD typeOut() SETGET
METHOD value() SETGET /* NOTE: Undocumented CA-Cl*pper var. */
METHOD New( nTop, nLeft, nBottom, nRight ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nTop, nLeft, nBottom, nRight ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -604,7 +604,7 @@ METHOD typeOut() CLASS RadioGroup
METHOD value() CLASS RadioGroup
RETURN ::nValue
METHOD New( nTop, nLeft, nBottom, nRight ) CLASS RadioGroup
METHOD Init( nTop, nLeft, nBottom, nRight ) CLASS RadioGroup
LOCAL cColor

4
src/rtl/scrollbr.prg
View File

@@ -81,7 +81,7 @@ CREATE CLASS ScrollBar FUNCTION HBScrollBar
METHOD update()
METHOD hitTest( nMRow, nMCol )
METHOD New( nStart, nEnd, nOffset, bSBlock, nOrient ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nStart, nEnd, nOffset, bSBlock, nOrient ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -391,7 +391,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 Init( nStart, nEnd, nOffset, bSBlock, nOrient ) CLASS ScrollBar
LOCAL cColor

4
src/rtl/tbcolumn.prg
View File

@@ -89,7 +89,7 @@ CREATE CLASS TBColumn
METHOD setStyle( nStyle, lNewValue )
#endif
METHOD New( cHeading, bBlock ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( cHeading, bBlock ) /* NOTE: This method is a Harbour extension [vszakats] */
ENDCLASS
@@ -200,7 +200,7 @@ METHOD setStyle( nStyle, lNewValue ) CLASS TBColumn
#endif
METHOD New( cHeading, bBlock ) CLASS TBColumn
METHOD Init( cHeading, bBlock ) CLASS TBColumn
::cHeading := cHeading /* NOTE: CA-Cl*pper allows any type here. [vszakats] */
::bBlock := bBlock /* NOTE: CA-Cl*pper allows any type here. [vszakats] */

4
src/rtl/tbrowse.prg
View File

@@ -240,7 +240,7 @@ CREATE CLASS TBrowse
/* NOTE: nMode is an undocumented parameter in CA-Cl*pper */
METHOD configure( nMode ) // mark that the internal settings of the TBrowse object should be reconfigured
METHOD new( nTop, nLeft, nBottom, nRight ) // constructor, NOTE: This method is a Harbour extension [vszakats]
METHOD init( nTop, nLeft, nBottom, nRight ) // constructor, NOTE: This method is a Harbour extension [vszakats]
PROTECTED:
@@ -302,7 +302,7 @@ FUNCTION TBrowseNew( nTop, nLeft, nBottom, nRight )
RETURN TBrowse():new( nTop, nLeft, nBottom, nRight )
METHOD new( nTop, nLeft, nBottom, nRight ) CLASS TBrowse
METHOD init( nTop, nLeft, nBottom, nRight ) CLASS TBrowse
__defaultNIL( @nTop, 0 )
__defaultNIL( @nLeft, 0 )

10
src/rtl/teditor.prg
View File

@@ -112,9 +112,9 @@ CREATE CLASS HBEditor
MESSAGE RefreshWindow() METHOD Display() // for compatibility
METHOD New( cText, nTop, nLeft, nBottom, ; // Constructor
nRight, lEditMode, nLineLength, nTabSize, ;
nTextRow, nTextCol, nWndRow, nWndCol )
METHOD Init( cText, nTop, nLeft, nBottom, ; // Constructor
nRight, lEditMode, nLineLength, nTabSize, ;
nTextRow, nTextCol, nWndRow, nWndCol )
PROTECTED:
@@ -150,8 +150,8 @@ CREATE CLASS HBEditor
ENDCLASS
METHOD New( cText, nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, ;
nTabSize, nTextRow, nTextCol, nWndRow, nWndCol ) CLASS HBEditor
METHOD Init( cText, nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, ;
nTabSize, nTextRow, nTextCol, nWndRow, nWndCol ) CLASS HBEditor
::cColorSpec := SetColor()

4
src/rtl/tget.prg
View File

@@ -99,7 +99,7 @@ CREATE CLASS Get
VAR rejected INIT .F. READONLY
VAR typeOut INIT .F. READONLY
METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD assign()
METHOD badDate()
@@ -1935,7 +1935,7 @@ METHOD Reader( xValue ) CLASS Get
/* ------------------------------------------------------------------------- */
METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get
METHOD Init( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get
IF nRow == NIL
nRow := Row()

4
src/rtl/tgetlist.prg
View File

@@ -112,7 +112,7 @@ CREATE CLASS HBGetList
METHOD ShowGetMsg( oGet, aMsg )
METHOD EraseGetMsg( aMsg )
METHOD New( GetList )
METHOD Init( GetList )
PROTECTED:
@@ -1656,7 +1656,7 @@ METHOD EraseGetMsg( aMsg ) CLASS HBGetList
/* --- */
METHOD New( GetList ) CLASS HBGetList
METHOD Init( GetList ) CLASS HBGetList
::aGetList := GetList

8
src/rtl/tlabel.prg
View File

@@ -100,8 +100,8 @@ CREATE CLASS HBLabelForm
VAR lOneMoreBand AS LOGICAL INIT .T.
VAR nCurrentCol AS NUMERIC // The current column in the band
METHOD New( cLBLName, lPrinter, cAltFile, lNoConsole, bFor, ;
bWhile, nNext, nRecord, lRest, lSample )
METHOD Init( cLBLName, lPrinter, cAltFile, lNoConsole, bFor, ;
bWhile, nNext, nRecord, lRest, lSample )
METHOD ExecuteLabel()
METHOD SampleLabels()
@@ -109,8 +109,8 @@ CREATE CLASS HBLabelForm
ENDCLASS
METHOD New( cLBLName, lPrinter, cAltFile, lNoConsole, bFor, ;
bWhile, nNext, nRecord, lRest, lSample ) CLASS HBLabelForm
METHOD Init( cLBLName, lPrinter, cAltFile, lNoConsole, bFor, ;
bWhile, nNext, nRecord, lRest, lSample ) CLASS HBLabelForm
LOCAL lPrintOn := .F. // PRINTER status
LOCAL lConsoleOn // CONSOLE status

4
src/rtl/tmenuitm.prg
View File

@@ -76,7 +76,7 @@ CREATE CLASS MenuItem FUNCTION HBMenuItem
METHOD isPopUp()
METHOD New( cCaption, boData, nShortcut, cMessage, nID ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( cCaption, boData, nShortcut, cMessage, nID ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -171,7 +171,7 @@ METHOD style( cStyle ) CLASS MenuItem
METHOD isPopUp() CLASS MenuItem
RETURN HB_ISOBJECT( ::data ) .AND. IS_IN( ::data:ClassName(), "POPUPMENU|HB_POPUPMENU" )
METHOD New( cCaption, boData, nShortcut, cMessage, nID ) CLASS MenuItem
METHOD Init( cCaption, boData, nShortcut, cMessage, nID ) CLASS MenuItem
::data := boData
::nID := hb_defaultValue( nID, 0 )

4
src/rtl/tmenusys.prg
View File

@@ -68,7 +68,7 @@ CREATE CLASS HBMenuSys
EXPORTED:
METHOD Modal( nSelection, nMsgRow, nMsgLeft, nMsgRight, cMsgColor, GetList )
METHOD New( oMenu )
METHOD Init( oMenu )
PROTECTED:
@@ -599,7 +599,7 @@ METHOD GetMsgArray() CLASS HBMenuSys
/* --- */
METHOD New( oMenu ) CLASS HBMenuSys
METHOD Init( oMenu ) CLASS HBMenuSys
::oMenu := oMenu

4
src/rtl/tpopup.prg
View File

@@ -93,7 +93,7 @@ CREATE CLASS PopupMenu FUNCTION HBPopupMenu
METHOD top( nTop ) SETGET
METHOD width() SETGET
METHOD New( nTop, nLeft, nBottom, nRight ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nTop, nLeft, nBottom, nRight ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -601,7 +601,7 @@ METHOD top( nTop ) CLASS PopupMenu
METHOD width() CLASS PopupMenu
RETURN ::nWidth
METHOD New( nTop, nLeft, nBottom, nRight ) CLASS PopupMenu
METHOD Init( nTop, nLeft, nBottom, nRight ) CLASS PopupMenu
LOCAL cColor

14
src/rtl/treport.prg
View File

@@ -156,7 +156,7 @@ CREATE CLASS HBReportForm
VAR cOffsetsBuff AS STRING
VAR cLengthsBuff AS STRING
METHOD New( cFrmName AS STRING, ;
METHOD Init( cFrmName AS STRING, ;
lPrinter AS LOGICAL, ;
cAltFile AS STRING, ;
lNoConsole AS LOGICAL, ;
@@ -180,7 +180,7 @@ CREATE CLASS HBReportForm
ENDCLASS
METHOD PROCEDURE New( cFrmName AS STRING, ;
METHOD Init( cFrmName AS STRING, ;
lPrinter AS LOGICAL, ;
cAltFile AS STRING, ;
lNoConsole AS LOGICAL, ;
@@ -421,7 +421,7 @@ METHOD PROCEDURE New( cFrmName AS STRING, ;
BREAK xBreakVal
ENDIF
RETURN
RETURN Self
METHOD PrintIt( cString AS STRING ) CLASS HBReportForm
@@ -532,7 +532,7 @@ METHOD ReportHeader() CLASS HBReportForm
RETURN Self
METHOD PROCEDURE ExecuteReport() CLASS HBReportForm
METHOD ExecuteReport() CLASS HBReportForm
LOCAL aRecordHeader := {} // Header for the current record
LOCAL aRecordToPrint := {} // Current record to print
@@ -822,7 +822,7 @@ METHOD PROCEDURE ExecuteReport() CLASS HBReportForm
ENDIF
ENDIF // Was this a summary report?
RETURN
RETURN Self
METHOD LoadReportFile( cFrmFile AS STRING ) CLASS HBReportForm
@@ -1217,11 +1217,11 @@ STATIC FUNCTION MakeAStr( uVar, cType )
RETURN "INVALID EXPRESSION"
PROCEDURE __ReportForm( cFRMName, lPrinter, cAltFile, lNoConsole, bFor, ;
FUNCTION __ReportForm( cFRMName, lPrinter, cAltFile, lNoConsole, bFor, ;
bWhile, nNext, nRecord, lRest, lPlain, cHeading, ;
lBEject, lSummary )
HBReportForm():New( cFrmName, lPrinter, cAltFile, lNoConsole, bFor, bWhile, nNext, nRecord, ;
lRest, lPlain, cHeading, lBEject, lSummary )
RETURN
RETURN NIL

4
src/rtl/tsymbol.prg
View File

@@ -50,7 +50,7 @@ CREATE CLASS Symbol
EXPORTED:
METHOD New( cSymName ) // Constructor. cSymName may already exists or not
METHOD Init( cSymName ) // Constructor. cSymName may already exists or not
METHOD name() // retrieves the symbol name
METHOD isEqual( oSymbol ) // Compares two symbol objects
METHOD exec( ... ) // Executes the function referred to by the
@@ -61,7 +61,7 @@ CREATE CLASS Symbol
ENDCLASS
METHOD New( cSymName ) CLASS Symbol
METHOD Init( cSymName ) CLASS Symbol
::nSym := __dynsN2Sym( cSymName )

4
src/rtl/ttextlin.prg
View File

@@ -51,12 +51,12 @@ CREATE CLASS HBTextLine
VAR cText /* A line of text */
VAR lSoftCR /* true if line doesn't end with a hb_eol() char (word wrapping) */
METHOD New( cLine, lSoftCR )
METHOD Init( cLine, lSoftCR )
ENDCLASS
/* Creates a new line of text */
METHOD New( cLine, lSoftCR ) CLASS HBTextLine
METHOD Init( cLine, lSoftCR ) CLASS HBTextLine
::cText := hb_defaultValue( cLine, "" )
::lSoftCR := hb_defaultValue( lSoftCR, .F. )

4
src/rtl/ttopbar.prg
View File

@@ -83,7 +83,7 @@ CREATE CLASS TopBarMenu FUNCTION HBTopBarMenu
METHOD right( nRight ) SETGET
METHOD row( nRow ) SETGET
METHOD New( nRow, nLeft, nRight ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD Init( nRow, nLeft, nRight ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:
@@ -416,7 +416,7 @@ METHOD row( nRow ) CLASS TopBarMenu
/* -------------------------------------------- */
METHOD New( nRow, nLeft, nRight ) CLASS TopBarMenu
METHOD Init( nRow, nLeft, nRight ) CLASS TopBarMenu
LOCAL cColor