3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing a loophole in GUI::format() for UTF8 template input.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-11-30 13:49:22 +01:00
parent c514f45260
commit 5a873dd1e5
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/format.hpp
View file

@ -30,6 +30,14 @@ inline wxString format_wxstr(const wxString& fmt, TArgs&&... args) {
return format_wxstr(fmt.ToUTF8().data(), std::forward<TArgs>(args)...); return format_wxstr(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
} }
template<typename... TArgs> template<typename... TArgs>
inline std::string format(const char* fmt, TArgs&&... args) {
return Slic3r::format(fmt, std::forward<TArgs>(args)...);
}
template<typename... TArgs>
inline std::string format(const std::string& fmt, TArgs&&... args) {
return Slic3r::format(fmt, std::forward<TArgs>(args)...);
}
template<typename... TArgs>
inline std::string format(const wxString& fmt, TArgs&&... args) { inline std::string format(const wxString& fmt, TArgs&&... args) {
return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...); return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
} }