mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fluid patch from Bill Spitzak; this moves the callback code down

Browse Source 
before the widgets that use them so that include files will get included
properly.


git-svn-id: file:///fltk/svn/fltk/trunk@29 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 1998-10-21 15:42:05 +00:00
parent 7657a2e4a5
commit eada39df34
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluid/Fl_Function_Type.cxx
View File

@ -208,7 +208,7 @@ void Fl_Function_Type::write_code2() {
if (ismain()) {
if (havewidgets) write_c(" w->show(argc, argv);\n");
write_c(" return Fl::run();\n");
} else if (havewidgets && !constructor)
} else if (havewidgets && !constructor && !return_type)
write_c(" return w;\n");
write_c("}\n");
indentation = 0;

10
fluid/code.cxx
View File

@ -243,8 +243,14 @@ int write_code(const char *s, const char *t) {
if (t && include_H_from_C)
write_c("#include \"%s\"\n", filename_name(t));
for (p = Fl_Type::first; p; p = p->next) p->write_static();
for (p = Fl_Type::first; p;) p = write_code(p);
for (p = Fl_Type::first; p;) {
// write all static data for this & all children first
p->write_static();
for (Fl_Type* q = p->next; q && q->level > p->level; q = q->next)
q->write_static();
// then write the nested code:
p = write_code(p);
}
if (!s) return 1;
int x = fclose(code_file);