From 8269338a65977020d9a5f2d01f42b044faa59d68 Mon Sep 17 00:00:00 2001 From: Jean-Francois Lefebvre Date: Sun, 9 Dec 2001 11:31:36 +0000 Subject: [PATCH] 2001-12-09 12:30 GMT+1 JFL (mafact) --- harbour/ChangeLog | 6 +++- harbour/source/rtl/checkbox.prg | 62 ++++++++++++++++----------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7ef2a34e23..9d962306e8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,4 +1,8 @@ -2001-12-08 22:10 GMT-3 Luiz Rafael Culik +2001-12-09 12:30 GMT+1 JFL (mafact) + * harbour/source/rtl/checkbox.prg + * Small typo corrected where nR became nT + +001-12-08 22:10 GMT-3 Luiz Rafael Culik * source/rtl/checkbox.prg * Readded checkbox() function. (I've forget to redefine in previus commit diff --git a/harbour/source/rtl/checkbox.prg b/harbour/source/rtl/checkbox.prg index 83cef87062..fcf8cc15fa 100644 --- a/harbour/source/rtl/checkbox.prg +++ b/harbour/source/rtl/checkbox.prg @@ -56,42 +56,42 @@ #ifdef HB_COMPAT_C53 CLASS HBCHECKBOX -Data Buffer init .f. -Data Caption -Data CapRow -Data CapCol -Data Cargo +Data Buffer init .f. +Data Caption +Data CapRow +Data CapCol +Data Cargo Data Col Data colorspec Data FBlock -Data HasFocus init .f. -Data Message init "" -Data Row -Data SBlock -Data Style init "[û ]" -Data lCursor +Data HasFocus init .f. +Data Message init "" +Data Row +Data SBlock +Data Style init "[û ]" +Data lCursor Data Typeout init .f. DATA ClassName init "CHECKBOX" METHOD New(nRow,nCol,cCaption) -METHOD SetFocus() -MESSAGE Select() METHOD _Select() -METHOD KillFocus() -METHOD DisPlay() +METHOD SetFocus() +MESSAGE Select() METHOD _Select() +METHOD KillFocus() +METHOD DisPlay() endclass -METHOD New(nRow,nCol,cCaption) +METHOD New(nRow,nCol,cCaption) Local cColor:='' Local oCheck - -::Buffer := .f. -::Caption := cCaption -::CapRow := nRow -::CapCol := nCol+3+1 -::Col := nCol +::Buffer := .f. +::Caption := cCaption +::CapRow := nRow +::CapCol := nCol+3+1 + +::Col := nCol if ( isdefcolor() ) - ::ColorSpec:="W/N,W+/N,W/N,W+/N" + ::ColorSpec:="W/N,W+/N,W/N,W+/N" else cColor := SetColor() ::ColorSpec:= __guicolor(cColor, 5) + "," + ; @@ -99,13 +99,13 @@ Local oCheck "," + __guicolor(cColor, 4) endif -::HasFocus := .f. -::Message := "" -::Row := nRow +::HasFocus := .f. +::Message := "" +::Row := nRow -::Style := "[û ]" +::Style := "[û ]" -::Typeout := .f. +::Typeout := .f. return Self @@ -145,12 +145,12 @@ Method KillFocus() CLASS HBCHECKBOX endif RETURN Self - + Method Display() CLASS HBCHECKBOX local cColor := SetColor(), nCurRow:= Row(), nCurCol:= Col(), ; - cOldStyle := ::Style, cCaption, nPos + cOldStyle := ::Style, cCaption, nPos dispbegin() if ( ::HasFocus ) @@ -223,6 +223,6 @@ function IsDefColor() local cColor:=SETCOLOR() Return ( ccolor== "W/N,N/W,N/N,N/N,N/W") function Checkbox(nr,ncol,cCaption) -return HBCHECKBOX():new(nt, nCol, cCaption) +return HBCHECKBOX():new(nr, nCol, cCaption) #endif