diff --git a/harbour/include/hbgetcmt.ch b/harbour/include/hbgetcmt.ch index 5827e7360e..16c1b01e24 100644 --- a/harbour/include/hbgetcmt.ch +++ b/harbour/include/hbgetcmt.ch @@ -131,6 +131,34 @@ [; ATail(GetList):Control:] ; ; ATail(GetList):Control:Display() +#command @ , , , GET ; + LISTBOX ; + [VALID ] ; + [WHEN ] ; + [CAPTION ] ; + [MESSAGE ] ; + [COLOR ] ; + [FOCUS ] ; + [STATE ] ; + [] ; + [] ; + [SEND ] ; + [GUISEND ] ; + ; + => SetPos( , ) ; + ; AAdd( GetList, ; + _GET_( , <(var)>, NIL, <{valid}>, <{when}> ) ) ; + ; ATail(GetList):Control := _ListBox_( ATail(Getlist):row, ; + ATail(Getlist):col, ; + , , , , , , ; + , <{fblock}>, <{sblock}>, <.drop.>, ; + <.scroll.> ) ; + ; ATail(GetList):reader := { | a, b, c, d | ; + GuiReader( a, b, c, d ) } ; + [; ATail(GetList):] ; + [; ATail(GetList):Control:] ; + ; ATail(GetList):Control:Display() + #command READ [MSG AT , , ; [MSG COLOR ]] ; diff --git a/harbour/makefile.bc b/harbour/makefile.bc index e1eca5e19f..91a86d95f4 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -319,6 +319,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\getlist.obj \ $(OBJ_DIR)\getsys.obj \ $(OBJ_DIR)\input.obj \ + $(OBJ_DIR)\listbox.obj \ $(OBJ_DIR)\memoedit.obj \ $(OBJ_DIR)\memvarbl.obj \ $(OBJ_DIR)\menuto.obj \ @@ -331,6 +332,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\radiogrp.obj \ $(OBJ_DIR)\readkey.obj \ $(OBJ_DIR)\readvar.obj \ + $(OBJ_DIR)\scrollbr.obj \ $(OBJ_DIR)\setfunc.obj \ $(OBJ_DIR)\setta.obj \ $(OBJ_DIR)\tbcolumn.obj \ @@ -1440,6 +1442,13 @@ $(OBJ_DIR)\lennum.obj : $(RTL_DIR)\lennum.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\listbox.c : $(RTL_DIR)\listbox.prg + $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ + +$(OBJ_DIR)\listbox.obj : $(OBJ_DIR)\listbox.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\math.obj : $(RTL_DIR)\math.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, @@ -1658,6 +1667,13 @@ $(OBJ_DIR)\scroll.obj : $(RTL_DIR)\scroll.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\scrollbr.c : $(RTL_DIR)\scrollbr.prg + $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ + +$(OBJ_DIR)\scrollbr.obj : $(OBJ_DIR)\scrollbr.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\seconds.obj : $(RTL_DIR)\seconds.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, diff --git a/harbour/makefile.vc b/harbour/makefile.vc index ccb2aabbc6..b524f636da 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -339,6 +339,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\getlist.obj \ $(OBJ_DIR)\getsys.obj \ $(OBJ_DIR)\input.obj \ + $(OBJ_DIR)\listbox.obj \ $(OBJ_DIR)\memoedit.obj \ $(OBJ_DIR)\memvarbl.obj \ $(OBJ_DIR)\menuto.obj \ @@ -351,6 +352,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\radiogrp.obj \ $(OBJ_DIR)\readkey.obj \ $(OBJ_DIR)\readvar.obj \ + $(OBJ_DIR)\scrollbr.obj \ $(OBJ_DIR)\setfunc.obj \ $(OBJ_DIR)\setta.obj \ $(OBJ_DIR)\tbcolumn.obj \ diff --git a/harbour/todo.txt b/harbour/todo.txt index cb25381972..24611ba852 100644 --- a/harbour/todo.txt +++ b/harbour/todo.txt @@ -24,7 +24,6 @@ string copies) Finish HbMake Luiz Rafael Culik -CaClipper remaining classes Luiz Rafael Culik Map Harbour functions 10 chars to be Luiz Rafael Culik compatible with Caclipper