From e6e9bcfb910752a5d80288207353358c2aa7a6a6 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 5 Jun 2024 14:18:30 +0800 Subject: [PATCH] ENH:don't need translate char to WxString jira: none Change-Id: I94864bf9e09db8c748484937f0ca83cae1db024f --- src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp index 91e8e0342..235d31ba3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp @@ -250,15 +250,15 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l }; ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 0); - if (selectable(_u8L("Union").c_str(), m_operation_mode == MeshBooleanOperation::Union, ImVec2(max_tab_length, 0.0f))) { + if (selectable(_u8L("Union"), m_operation_mode == MeshBooleanOperation::Union, ImVec2(max_tab_length, 0.0f))) { m_operation_mode = MeshBooleanOperation::Union; } ImGui::SameLine(0, 0); - if (selectable(_u8L("Difference").c_str(), m_operation_mode == MeshBooleanOperation::Difference, ImVec2(max_tab_length, 0.0f))) { + if (selectable(_u8L("Difference"), m_operation_mode == MeshBooleanOperation::Difference, ImVec2(max_tab_length, 0.0f))) { m_operation_mode = MeshBooleanOperation::Difference; } ImGui::SameLine(0, 0); - if (selectable(_u8L("Intersection").c_str(), m_operation_mode == MeshBooleanOperation::Intersection, ImVec2(max_tab_length, 0.0f))) { + if (selectable(_u8L("Intersection"), m_operation_mode == MeshBooleanOperation::Intersection, ImVec2(max_tab_length, 0.0f))) { m_operation_mode = MeshBooleanOperation::Intersection; } ImGui::PopStyleVar(); @@ -270,7 +270,7 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l wxString select_src_str = m_src.mv ? "1 " + _u8L("selected") : _u8L("Select"); select_src_str << "##select_source_volume"; ImGui::PushItemWidth(select_btn_length); - if (selectable(select_src_str.c_str(), m_selecting_state == MeshBooleanSelectingState::SelectSource, ImVec2(select_btn_length, 0))) + if (selectable(select_src_str, m_selecting_state == MeshBooleanSelectingState::SelectSource, ImVec2(select_btn_length, 0))) m_selecting_state = MeshBooleanSelectingState::SelectSource; ImGui::PopItemWidth(); if (m_src.mv) { @@ -298,7 +298,7 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l wxString select_tool_str = m_tool.mv ? "1 " + _u8L("selected") : _u8L("Select"); select_tool_str << "##select_tool_volume"; ImGui::PushItemWidth(select_btn_length); - if (selectable(select_tool_str.c_str(), m_selecting_state == MeshBooleanSelectingState::SelectTool, ImVec2(select_btn_length, 0))) + if (selectable(select_tool_str, m_selecting_state == MeshBooleanSelectingState::SelectTool, ImVec2(select_btn_length, 0))) m_selecting_state = MeshBooleanSelectingState::SelectTool; ImGui::PopItemWidth(); if (m_tool.mv) {