str = spellchecker_.feedback(ob);
}
- str = formatted(str, dialog_->text_warning->w-10,
+ str = formatted(_(str), dialog_->text_warning->w-10,
FL_SMALL_SIZE, FL_NORMAL_STYLE);
- fl_set_object_label(dialog_->text_warning, _(str.c_str()));
+ fl_set_object_label(dialog_->text_warning, str.c_str());
fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
}
// Note that X stores the RGB values in the range 0 - 65535
// whilst we require them in the range 0 - 255.
RGBColor col;
- col.r = static_cast<unsigned char>(xcol.red);
- col.g = static_cast<unsigned char>(xcol.green);
- col.b = static_cast<unsigned char>(xcol.blue);
+ col.r = xcol.red / 256;
+ col.g = xcol.green / 256;
+ col.b = xcol.blue / 256;
// Create a valid X11 name of the form "#rrggbb" and change the
// LColor X11name to this. Don't want to trigger a redraw,
string const FormPreferences::Converters::GetFrom() const
{
int const i = fl_get_choice(dialog_->choice_from);
- if (i > 0)
+ if (i > 0 && i <= local_formats.size())
return local_formats.Get(i-1).name();
else {
lyxerr << "FormPreferences::Converters::GetFrom: No choice!"
string const FormPreferences::Converters::GetTo() const
{
int const i = fl_get_choice(dialog_->choice_to);
- if (i > 0)
+ if (i > 0 && i <= local_formats.size())
return local_formats.Get(i-1).name();
else {
lyxerr << "FormPreferences::Converters::GetTo: No choice!"
else if (ob == dialog_->input_landscape)
str = lyxrc.getDescription(LyXRC::RC_PRINTLANDSCAPEFLAG);
else if (ob == dialog_->input_copies)
- str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG);
- else if (ob == dialog_->input_collated)
str = lyxrc.getDescription(LyXRC::RC_PRINTCOPIESFLAG);
+ else if (ob == dialog_->input_collated)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG);
else if (ob == dialog_->input_paper_type)
str = lyxrc.getDescription(LyXRC::RC_PRINTPAPERFLAG);
else if (ob == dialog_->input_paper_size)
{
warningPosted = true;
- string str = N_("WARNING!") + string(" ") + warning;
+ string str = _("WARNING!") + string(" ") + warning;
str = formatted(str, dialog_->text_warning->w-10,
FL_SMALL_SIZE, FL_NORMAL_STYLE);
- fl_set_object_label(dialog_->text_warning, _(str.c_str()));
+ fl_set_object_label(dialog_->text_warning, str.c_str());
fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
}