diff options
| author | Matthias Melcher <github@matthiasm.com> | 2023-07-14 23:42:09 +0200 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2023-07-14 23:42:17 +0200 |
| commit | 5d69828ed08c5f3a254a2d5ae9a9ed65decb54a7 (patch) | |
| tree | 92a443a7cffd1b4f49fa101be3432de1361bdd6f /fluid/Fl_Menu_Type.cxx | |
| parent | b2eb664586b8d464e3382101846e4bde250285df (diff) | |
FLUID: fixes all overlapping widgets in all .fl files
Also fixes an issue with multiple use of the same variable
for different types of i18n.
Diffstat (limited to 'fluid/Fl_Menu_Type.cxx')
| -rw-r--r-- | fluid/Fl_Menu_Type.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 284e2e66d..6ca424041 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -380,7 +380,7 @@ void Fl_Menu_Item_Type::write_item(Fd_Code_Writer& f) { switch (g_project.i18n_type) { case 1: // we will call i18n when the menu is instantiated for the first time - f.write_c("%s(", g_project.i18n_static_function.c_str()); + f.write_c("%s(", g_project.i18n_gnu_static_function.c_str()); f.write_cstring(label()); f.write_c(")"); break; @@ -481,11 +481,11 @@ void Fl_Menu_Item_Type::write_code1(Fd_Code_Writer& f) { f.write_c("%sml->labelb = o->label();\n", f.indent()); } else if (g_project.i18n_type==1) { f.write_c("%sml->labelb = %s(o->label());\n", - f.indent(), g_project.i18n_function.c_str()); + f.indent(), g_project.i18n_gnu_function.c_str()); } else if (g_project.i18n_type==2) { f.write_c("%sml->labelb = catgets(%s,%s,i+%d,o->label());\n", - f.indent(), g_project.i18n_file[0] ? g_project.i18n_file.c_str() : "_catalog", - g_project.i18n_set.c_str(), msgnum()); + f.indent(), g_project.i18n_pos_file[0] ? g_project.i18n_pos_file.c_str() : "_catalog", + g_project.i18n_pos_set.c_str(), msgnum()); } f.write_c("%sml->typea = FL_IMAGE_LABEL;\n", f.indent()); f.write_c("%sml->typeb = FL_NORMAL_LABEL;\n", f.indent()); @@ -503,11 +503,11 @@ void Fl_Menu_Item_Type::write_code1(Fd_Code_Writer& f) { start_menu_initialiser(f, menuItemInitialized, mname, i); if (g_project.i18n_type==1) { f.write_c("%so->label(%s(o->label()));\n", - f.indent(), g_project.i18n_function.c_str()); + f.indent(), g_project.i18n_gnu_function.c_str()); } else if (g_project.i18n_type==2) { f.write_c("%so->label(catgets(%s,%s,i+%d,o->label()));\n", - f.indent(), g_project.i18n_file[0] ? g_project.i18n_file.c_str() : "_catalog", - g_project.i18n_set.c_str(), msgnum()); + f.indent(), g_project.i18n_pos_file[0] ? g_project.i18n_pos_file.c_str() : "_catalog", + g_project.i18n_pos_set.c_str(), msgnum()); } } } |