diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-10-04 12:12:55 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2018-10-08 18:41:37 +0300 |
| commit | 1f926964ee0d93ce0044c75f76aee52d5db15dfd (patch) | |
| tree | d0144ebfe36b958bfab615e7019d84c6f3b489a2 /src/slic3r/GUI/Field.cpp | |
| parent | 99fe5761d8fca6349b924cb5c02198aed39ddb94 (diff) | |
WIP: Plater, build fixes
Diffstat (limited to 'src/slic3r/GUI/Field.cpp')
| -rw-r--r-- | src/slic3r/GUI/Field.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 02fc9b8b6..5dbc65877 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -611,8 +611,9 @@ void ColourPicker::BUILD() if (m_opt.width >= 0) size.SetWidth(m_opt.width); wxString clr(static_cast<const ConfigOptionStrings*>(m_opt.default_value)->get_at(m_opt_idx)); + // FIXME: verify clr is valid, otherwise this causes an assert auto temp = new wxColourPickerCtrl(m_parent, wxID_ANY, clr, wxDefaultPosition, size); - + // // recast as a wxWindow to fit the calling convention window = dynamic_cast<wxWindow*>(temp); |