mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-21 21:38:00 +01:00
- Made changes to reflect API changes in wtext.c
This commit is contained in:
@@ -505,7 +505,6 @@ testTextField(WMScreen *scr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
void
|
void
|
||||||
testText(WMScreen *scr)
|
testText(WMScreen *scr)
|
||||||
{
|
{
|
||||||
@@ -529,7 +528,6 @@ testText(WMScreen *scr)
|
|||||||
if(file) {
|
if(file) {
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
||||||
<<<<<<< wtest.c
|
|
||||||
WMFreezeText(text);
|
WMFreezeText(text);
|
||||||
while(fgets(buf, 1023, file))
|
while(fgets(buf, 1023, file))
|
||||||
WMAppendTextStream(text, buf);
|
WMAppendTextStream(text, buf);
|
||||||
@@ -539,24 +537,11 @@ testText(WMScreen *scr)
|
|||||||
} else {
|
} else {
|
||||||
WMAppendTextStream(text, "<HTML><i>Where's</i> the <b>README</b>?");
|
WMAppendTextStream(text, "<HTML><i>Where's</i> the <b>README</b>?");
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
WMFreezeText(text);
|
|
||||||
while(fgets(buf, 1023, file))
|
|
||||||
WMAppendTextStream(text, buf);
|
|
||||||
|
|
||||||
fclose(file);
|
|
||||||
WMThawText(text);
|
|
||||||
WMRefreshText(text, 0, 0);
|
|
||||||
} else {
|
|
||||||
WMAppendTextStream(text, "<HTML><i>Where's</i> the <b>README</b>?");
|
|
||||||
}
|
|
||||||
>>>>>>> 1.12
|
|
||||||
|
|
||||||
WMRealizeWidget(win);
|
WMRealizeWidget(win);
|
||||||
WMMapSubwidgets(win);
|
WMMapSubwidgets(win);
|
||||||
WMMapWidget(win);
|
WMMapWidget(win);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
Reference in New Issue
Block a user