diff options
| author | Matthias Melcher <github@matthiasm.com> | 2022-11-26 01:35:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-26 01:35:50 +0100 |
| commit | 6e5c472cf9641426c5425ea2f404e8908d76d63e (patch) | |
| tree | 0f7ec46f88f01257702f1f9a7c8323a7fdc768c3 /fluid/Fl_Widget_Type.cxx | |
| parent | c1a7c4af042a593b4b3a1df3e750b0cc80362486 (diff) | |
Handle Fluid project settings better (#556)
Fix allocation bug in Fl_String
Diffstat (limited to 'fluid/Fl_Widget_Type.cxx')
| -rw-r--r-- | fluid/Fl_Widget_Type.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index dc87cb871..6c9529bc8 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -2631,18 +2631,18 @@ void Fl_Widget_Type::write_code1() { } if (label() && *label()) { write_c(", "); - switch (i18n_type) { + switch (P.i18n_type) { case 0 : /* None */ write_cstring(label()); break; case 1 : /* GNU gettext */ - write_c("%s(", i18n_function); + write_c("%s(", P.i18n_function.value()); write_cstring(label()); write_c(")"); break; case 2 : /* POSIX catgets */ - write_c("catgets(%s,%s,%d,", i18n_file[0] ? i18n_file : "_catalog", - i18n_set, msgnum()); + write_c("catgets(%s,%s,%d,", P.i18n_file[0] ? P.i18n_file.value() : "_catalog", + P.i18n_set.value(), msgnum()); write_cstring(label()); write_c(")"); break; @@ -2704,18 +2704,18 @@ void Fl_Widget_Type::write_widget_code() { if (tooltip() && *tooltip()) { write_c("%s%s->tooltip(",indent(), var); - switch (i18n_type) { + switch (P.i18n_type) { case 0 : /* None */ write_cstring(tooltip()); break; case 1 : /* GNU gettext */ - write_c("%s(", i18n_function); + write_c("%s(", P.i18n_function.value()); write_cstring(tooltip()); write_c(")"); break; case 2 : /* POSIX catgets */ - write_c("catgets(%s,%s,%d,", i18n_file[0] ? i18n_file : "_catalog", - i18n_set, msgnum() + 1); + write_c("catgets(%s,%s,%d,", P.i18n_file[0] ? P.i18n_file.value() : "_catalog", + P.i18n_set.value(), msgnum() + 1); write_cstring(tooltip()); write_c(")"); break; @@ -2737,7 +2737,7 @@ void Fl_Widget_Type::write_widget_code() { else if (is_value_input()) shortcut = ((Fl_Value_Input*)o)->shortcut(); else if (is_text_display()) shortcut = ((Fl_Text_Display*)o)->shortcut(); if (shortcut) { - if (use_FL_COMMAND && (shortcut & (FL_CTRL|FL_META))) { + if (P.use_FL_COMMAND && (shortcut & (FL_CTRL|FL_META))) { write_c("%s%s->shortcut(FL_COMMAND|0x%x);\n", indent(), var, shortcut & ~(FL_CTRL|FL_META)); } else { write_c("%s%s->shortcut(0x%x);\n", indent(), var, shortcut); |