diff options
| author | Aaron M. Ucko <ucko@debian.org> | 2007-05-20 01:20:30 +0000 |
|---|---|---|
| committer | Aaron M. Ucko <ucko@debian.org> | 2007-05-20 01:20:30 +0000 |
| commit | da5f6f8dd1f87d32cea2f882d251ebaecc3c7629 (patch) | |
| tree | 5772cc71ce588e5cbdbb7e458e2c5876dcbc8fcc /fluid/file.cxx | |
| parent | ee19f9cc1847049ccb983313bb11df47d253df16 (diff) | |
| parent | 9b5d5801c27165ad47245acb580f30b8ce2d20b4 (diff) | |
Merge new upstream snapshot / release candidate (1.1.8~r5840) into trunk.
Diffstat (limited to 'fluid/file.cxx')
| -rw-r--r-- | fluid/file.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fluid/file.cxx b/fluid/file.cxx index ffbfa41..95f2f42 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -1,5 +1,5 @@ // -// "$Id: file.cxx 4288 2005-04-16 00:13:17Z mike $" +// "$Id: file.cxx 5808 2007-05-10 12:06:31Z matt $" // // Fluid file routines for the Fast Light Tool Kit (FLTK). // @@ -323,6 +323,8 @@ int write_file(const char *filename, int selected_only) { "version %.4f",FL_VERSION); if(!include_H_from_C) write_string("\ndo_not_include_H_from_C"); + if(use_FL_COMMAND) + write_string("\nuse_FL_COMMAND"); if (i18n_type) { write_string("\ni18n_type %d", i18n_type); write_string("\ni18n_include %s", i18n_include); @@ -404,6 +406,10 @@ static void read_children(Fl_Type *p, int paste) { include_H_from_C=0; goto CONTINUE; } + if (!strcmp(c,"use_FL_COMMAND")) { + use_FL_COMMAND=1; + goto CONTINUE; + } if (!strcmp(c,"i18n_type")) { i18n_type = atoi(read_word()); goto CONTINUE; @@ -504,6 +510,7 @@ int read_file(const char *filename, int merge) { if (o->is_menu_button()) o->add_child(0,0); for (o = Fl_Type::first; o; o = o->next) if (o->selected) {Fl_Type::current = o; break;} + selection_changed(Fl_Type::current); return close_read(); } @@ -639,5 +646,5 @@ void read_fdesign() { } // -// End of "$Id: file.cxx 4288 2005-04-16 00:13:17Z mike $". +// End of "$Id: file.cxx 5808 2007-05-10 12:06:31Z matt $". // |