diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-02 16:17:04 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-02 16:17:04 +0000 |
| commit | 75b6b221ce1c88905b1485f0e25ab3880982efc4 (patch) | |
| tree | 6a34d2ba5621b8e8c920f2832707ae339a15a6c5 /fluid | |
| parent | 836d2fac260c861106e0d96203bea4a04c9dd2d2 (diff) | |
FileIcon, FileBrowser, FileChooser stuff.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1517 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/code.cxx | 15 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 10 |
2 files changed, 16 insertions, 9 deletions
diff --git a/fluid/code.cxx b/fluid/code.cxx index 0d6975746..f523ec085 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -1,5 +1,5 @@ // -// "$Id: code.cxx,v 1.9.2.9 2001/01/22 15:13:39 easysw Exp $" +// "$Id: code.cxx,v 1.9.2.9.2.1 2001/08/02 16:17:04 easysw Exp $" // // Code output routines for the Fast Light Tool Kit (FLTK). // @@ -254,6 +254,8 @@ static Fl_Type* write_code(Fl_Type* p) { return q; } +extern const char* header_file_name; + int write_code(const char *s, const char *t) { write_number++; delete id_root; id_root = 0; @@ -303,8 +305,13 @@ int write_code(const char *s, const char *t) { } } } - if (t && include_H_from_C) - write_c("#include \"%s\"\n", filename_name(t)); + if (t && include_H_from_C) { + if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) { + write_c("#include \"%s\"\n", filename_name(t)); + } else { + write_c("#include \"%s\"\n", t); + } + } for (Fl_Type* p = Fl_Type::first; p;) { // write all static data for this & all children first p->write_static(); @@ -405,5 +412,5 @@ void Fl_Type::write_code1() { void Fl_Type::write_code2() {} // -// End of "$Id: code.cxx,v 1.9.2.9 2001/01/22 15:13:39 easysw Exp $". +// End of "$Id: code.cxx,v 1.9.2.9.2.1 2001/08/02 16:17:04 easysw Exp $". // diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 7c359b078..b1f317f6b 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.15.2.13 2001/03/15 22:39:56 easysw Exp $" +// "$Id: fluid.cxx,v 1.15.2.13.2.1 2001/08/02 16:17:04 easysw Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -181,13 +181,13 @@ void write_cb(Fl_Widget *, void *) { char hname[1024]; strcpy(i18n_program, filename_name(filename)); filename_setext(i18n_program, ""); - if (*code_file_name == '.') { + if (*code_file_name == '.' && strchr(code_file_name, '/') == NULL) { strcpy(cname,filename_name(filename)); filename_setext(cname, code_file_name); } else { strcpy(cname, code_file_name); } - if (*header_file_name == '.') { + if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) { strcpy(hname,filename_name(filename)); filename_setext(hname, header_file_name); } else { @@ -196,7 +196,7 @@ void write_cb(Fl_Widget *, void *) { if (!compile_only) goto_source_dir(); int x = write_code(cname,hname); if (!compile_only) leave_source_dir(); - strcat(cname, "/"); strcat(cname,header_file_name); + strcat(cname, " and "); strcat(cname,hname); if (compile_only) { if (!x) {fprintf(stderr,"%s : %s\n",cname,strerror(errno)); exit(1);} } else { @@ -474,5 +474,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.15.2.13 2001/03/15 22:39:56 easysw Exp $". +// End of "$Id: fluid.cxx,v 1.15.2.13.2.1 2001/08/02 16:17:04 easysw Exp $". // |