diff --git a/src/info.cpp b/src/info.cpp index 6f355cc2..42ffd371 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -192,8 +192,8 @@ void Info::GetArtist() first = 0; } input.close(); - w->SetFormatting(fmtBold, "\n\nSimilar artists:\n", fmtBoldEnd, 0); - w->SetFormatting(Config.color2, "\n * ", clEnd); + w->SetFormatting(fmtBold, U("\n\nSimilar artists:\n"), fmtBoldEnd, 0); + w->SetFormatting(Config.color2, U("\n * "), clEnd); // below is used so format won't be removed using RemoveFormatting() by accident. w->ForgetFormatting(); w->Flush(); diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index d40367f1..959e43ae 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -1724,7 +1724,7 @@ int main(int argc, char *argv[]) ShowMessage("Searching..."); Screen *s = static_cast *>(myScreen); s->Main()->RemoveFormatting(); - ShowMessage("%s", s->Main()->SetFormatting(fmtReverse, findme, fmtReverseEnd) || findme.empty() ? "Done!" : "No matching patterns found"); + ShowMessage("%s", s->Main()->SetFormatting(fmtReverse, TO_WSTRING(findme), fmtReverseEnd) || findme.empty() ? "Done!" : "No matching patterns found"); s->Main()->Flush(); } } diff --git a/src/scrollpad.h b/src/scrollpad.h index bb6cbd33..b8bd56c1 100644 --- a/src/scrollpad.h +++ b/src/scrollpad.h @@ -115,9 +115,7 @@ namespace NCurses itsBuffer << obj; return *this; } - # ifdef _UTF8 - bool SetFormatting(short vb, const std::string &s, short ve, bool for_each = 1) { return SetFormatting(vb, ToWString(s), ve, for_each); } Scrollpad &operator<<(const std::string &s); # endif // _UTF8