Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove wrapper for Scrollpad::SetFormating() used with --enable-unicode

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-16 22:21:17 +00:00
parent cf3f8350c0
commit 6723808c4f
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/info.cpp
View File

@@ -192,8 +192,8 @@ void Info::GetArtist()
first = 0; first = 0;
} }
input.close(); input.close();
w->SetFormatting(fmtBold, "\n\nSimilar artists:\n", fmtBoldEnd, 0); w->SetFormatting(fmtBold, U("\n\nSimilar artists:\n"), fmtBoldEnd, 0);
w->SetFormatting(Config.color2, "\n * ", clEnd); w->SetFormatting(Config.color2, U("\n * "), clEnd);
// below is used so format won't be removed using RemoveFormatting() by accident. // below is used so format won't be removed using RemoveFormatting() by accident.
w->ForgetFormatting(); w->ForgetFormatting();
w->Flush(); w->Flush();

2
src/ncmpcpp.cpp
View File

@@ -1724,7 +1724,7 @@ int main(int argc, char *argv[])
ShowMessage("Searching..."); ShowMessage("Searching...");
Screen<Scrollpad> *s = static_cast<Screen<Scrollpad> *>(myScreen); Screen<Scrollpad> *s = static_cast<Screen<Scrollpad> *>(myScreen);
s->Main()->RemoveFormatting(); 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(); s->Main()->Flush();
} }
} }

2
src/scrollpad.h
View File

@@ -115,9 +115,7 @@ namespace NCurses
itsBuffer << obj; itsBuffer << obj;
return *this; return *this;
} }
# ifdef _UTF8 # 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); Scrollpad &operator<<(const std::string &s);
# endif // _UTF8 # endif // _UTF8