3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-26 10:11:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'origin/master' into ys_unsaved_changes

Browse source
This commit is contained in:
YuSanka 2020-08-19 15:44:24 +02:00
commit 15545bbd90
12 changed files with 313 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/ImGuiWrapper.cpp
View file

@ -362,7 +362,7 @@ bool ImGuiWrapper::checkbox(const wxString &label, bool &value)
void ImGuiWrapper::text(const char *label)
{
ImGui::Text(label, NULL);
ImGui::Text("%s", label);
}
void ImGuiWrapper::text(const std::string &label)
@ -378,7 +378,7 @@ void ImGuiWrapper::text(const wxString &label)
void ImGuiWrapper::text_colored(const ImVec4& color, const char* label)
{
ImGui::TextColored(color, label);
ImGui::TextColored(color, "%s", label);
}
void ImGuiWrapper::text_colored(const ImVec4& color, const std::string& label)