diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-04-25 01:57:51 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-04-25 01:57:51 +0000 |
| commit | 9e3610c75f8ceeebb8e59db2c641f21082979856 (patch) | |
| tree | 4f482a4bc220c777ce509774d4737f3534ed41bf /fluid/Fl_Menu_Type.cxx | |
| parent | aa102a4595e162cd0568746809cd6e18fbe20cfc (diff) | |
Bug fixes where I was getting the value from the input field instead of
the global pointer (caused random crashes.)
Now default to no file variable for catgets() mode, and declare and
initialize (as needed) a static _catalog variable when a global file
variable is not provided. The catalog name is the basename of the
fluid file (no .fl)...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1084 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Fl_Menu_Type.cxx')
| -rw-r--r-- | fluid/Fl_Menu_Type.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index f3bfa8ab4..eb34a55c4 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Type.cxx,v 1.16.2.6 2000/04/24 18:22:47 mike Exp $" +// "$Id: Fl_Menu_Type.cxx,v 1.16.2.7 2000/04/25 01:57:49 mike Exp $" // // Menu item code for the Fast Light Tool Kit (FLTK). // @@ -227,7 +227,8 @@ void Fl_Menu_Item_Type::write_item() { write_c(")"); break; case 2 : /* POSIX catgets */ - write_c("catgets(%s,%s,%d,", i18n_file, i18n_set, msgnum ++); + write_c("catgets(%s,%s,%d,", i18n_file[0] ? i18n_file : "_catalog", + i18n_set, msgnum ++); write_cstring(label()); write_c(")"); break; @@ -462,5 +463,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) { } // -// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.6 2000/04/24 18:22:47 mike Exp $". +// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.7 2000/04/25 01:57:49 mike Exp $". // |