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

Fixes issue #7247: Wxwidgets 3.0 yet again. MsgDialog.hpp:270:40: error: ‘wxASCII_STR’ was not declared in this scope

Browse source 
Replace wxASCII_STR with wxString::FromAscii for compatibility with wxWidgets 3.0
This commit is contained in:
combolek 2021-11-06 12:39:52 -07:00 committed by Lukáš Matěna
parent c782c2d389
commit 24d1303126
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/MsgDialog.hpp
View file

@ -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() {}
};