From 24d13031268aaa0f617657521af8c22690057191 Mon Sep 17 00:00:00 2001
From: combolek <4743344+combolek@users.noreply.github.com>
Date: Sat, 6 Nov 2021 12:39:52 -0700
Subject: [PATCH] =?UTF-8?q?Fixes=20issue=20#7247:=20Wxwidgets=203.0=20yet?=
 =?UTF-8?q?=20again.=20MsgDialog.hpp:270:40:=20error:=20=E2=80=98wxASCII?=
 =?UTF-8?q?=5FSTR=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace wxASCII_STR with wxString::FromAscii for compatibility with wxWidgets 3.0
---
 src/slic3r/GUI/MsgDialog.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp
index 909ff396d6..a4807fd06d 100644
--- a/src/slic3r/GUI/MsgDialog.hpp
+++ b/src/slic3r/GUI/MsgDialog.hpp
@@ -98,7 +98,7 @@ public:
 				const wxPoint& pos = wxDefaultPosition,
 				const wxSize& size = wxDefaultSize,
 				long style = wxLI_HORIZONTAL,
-				const wxString& name = wxASCII_STR(wxTextCtrlNameStr))
+				const wxString& name = wxString::FromAscii(wxTextCtrlNameStr))
 	: wxTextCtrl(parent, id, wxEmptyString, pos, size!=wxDefaultSize ? size : (style == wxLI_HORIZONTAL ? wxSize(10, 1) : wxSize(1, 10)), wxSIMPLE_BORDER, wxDefaultValidator, name)
 	{
 		this->Enable(false);
@@ -268,7 +268,7 @@ public:
 		const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize,
 		long style = wxLI_HORIZONTAL,
-		const wxString& name = wxASCII_STR(wxStaticLineNameStr))
+		const wxString& name = wxString::FromAscii(wxStaticLineNameStr))
 		: wxStaticLine(parent, id, pos, size, style, name) {}
 	~StaticLine() {}
 };