diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am
index e4387638..5fc56290 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = no-dependencies
-noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel #testtext
+noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
@LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
@@ -13,8 +13,6 @@ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
-#testtext_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
-
EXTRA_DIST = logo.xpm upbtn.xpm
diff --git a/WINGs/Tests/wtest.c b/WINGs/Tests/wtest.c
index 70f8456f..3c38d406 100644
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -395,7 +395,6 @@ testSlider(WMScreen *scr)
WMMapWidget(win);
}
-
void
testTextField(WMScreen *scr)
{
@@ -404,7 +403,7 @@ testTextField(WMScreen *scr)
windowCount++;
- win = WMCreateWindow(scr, "testText");
+ win = WMCreateWindow(scr, "testTextField");
WMResizeWidget(win, 400, 300);
WMSetWindowCloseAction(win, closeAction, NULL);
@@ -424,6 +423,46 @@ testTextField(WMScreen *scr)
}
+void
+testText(WMScreen *scr)
+{
+ WMWindow *win;
+ WMText *text;
+ FILE *file = fopen("../README", "r");
+
+ windowCount++;
+
+ win = WMCreateWindow(scr, "testText");
+ WMResizeWidget(win, 500, 300);
+
+ WMSetWindowCloseAction(win, closeAction, NULL);
+
+ text = WMCreateText(win);
+ WMResizeWidget(text, 480, 280);
+ WMMoveWidget(text, 10, 10);
+ WMSetTextHasVerticalScroller(text, True);
+ WMSetTextEditable(text, False);
+
+ if(file) {
+ char buf[1024];
+
+ WMFreezeText(text);
+ while(fgets(buf, 1023, file))
+ WMAppendTextStream(text, buf);
+
+ fclose(file);
+ WMThawText(text);
+ WMRefreshText(text, 0, 0);
+ } else {
+ WMAppendTextStream(text, "Where's the README?");
+ }
+
+ WMRealizeWidget(win);
+ WMMapSubwidgets(win);
+ WMMapWidget(win);
+
+}
+
void
testProgressIndicator(WMScreen *scr)
@@ -1075,14 +1114,17 @@ int main(int argc, char **argv)
*
* Put the testSomething() function you want to test here.
*/
+
testColorWell(scr);
-
+
+#if 0
+ testTextField(scr);
+ testText(scr);
testDragAndDrop(scr);
testDragAndDrop(scr);
testFontPanel(scr);
-#if 0
testScrollView(scr);
testButton(scr);
@@ -1099,7 +1141,6 @@ int main(int argc, char **argv)
testGradientButtons(scr);
testProgressIndicator(scr);
- testTextField(scr);
testOpenFilePanel(scr);
testList(scr);