From 3ad4bf5ad87010b8ad09031a8d9234190cecdc4b Mon Sep 17 00:00:00 2001 From: nwanua Date: Sat, 4 Nov 2000 02:45:23 +0000 Subject: [PATCH] *** empty log message *** --- WINGs/Tests/wtest.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/WINGs/Tests/wtest.c b/WINGs/Tests/wtest.c index 18324588..01448144 100644 --- a/WINGs/Tests/wtest.c +++ b/WINGs/Tests/wtest.c @@ -178,7 +178,7 @@ testList(WMScreen *scr) WMSetLabelText(mtitle, "Multiple selection list"); list = WMCreateList(win); - //WMSetListAllowEmptySelection(list, True); + WMSetListAllowEmptySelection(list, True); WMMoveWidget(list, 10, 40); for (i=0; i<50; i++) { sprintf(text, "Item %i", i); @@ -186,7 +186,7 @@ testList(WMScreen *scr) } mlist = WMCreateList(win); WMSetListAllowMultipleSelection(mlist, True); - //WMSetListAllowEmptySelection(mlist, True); + WMSetListAllowEmptySelection(mlist, True); WMMoveWidget(mlist, 210, 40); for (i=0; i<135; i++) { sprintf(text, "Item %i", i); @@ -529,6 +529,17 @@ testText(WMScreen *scr) if(file) { char buf[1024]; +<<<<<<< wtest.c + WMFreezeText(text); + while(fgets(buf, 1023, file)) + WMAppendTextStream(text, buf); + + fclose(file); + WMThawText(text); + } else { + WMAppendTextStream(text, "Where's the README?"); + } +======= WMFreezeText(text); while(fgets(buf, 1023, file)) WMAppendTextStream(text, buf); @@ -539,6 +550,7 @@ testText(WMScreen *scr) } else { WMAppendTextStream(text, "Where's the README?"); } +>>>>>>> 1.12 WMRealizeWidget(win); WMMapSubwidgets(win); -- 2.11.4.GIT