Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

This commit is contained in:
enricoturri1966 2020-08-18 08:27:30 +02:00
commit cd45b78c48

View File

@ -371,7 +371,7 @@ bool ImGuiWrapper::checkbox(const wxString &label, bool &value)
void ImGuiWrapper::text(const char *label) void ImGuiWrapper::text(const char *label)
{ {
ImGui::Text(label, NULL); ImGui::Text("%s", label);
} }
void ImGuiWrapper::text(const std::string &label) void ImGuiWrapper::text(const std::string &label)
@ -387,7 +387,7 @@ void ImGuiWrapper::text(const wxString &label)
void ImGuiWrapper::text_colored(const ImVec4& color, const char* 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) void ImGuiWrapper::text_colored(const ImVec4& color, const std::string& label)