3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 19:28:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed a build under OSX

Browse source
This commit is contained in:
Slic3rPE 2020-08-06 10:56:14 +02:00
parent 6ee804f466
commit 42f3bfb0f6
5 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/ExtraRenderers.hpp
View file

@ -77,9 +77,9 @@ public:
wxDataViewCustomRenderer(wxT("DataViewBitmapText"), mode, align),
m_parent(parent)
{
#ifdef SUPPORTS_MARKUP
#if defined(SUPPORTS_MARKUP) && defined(wxHAS_GENERIC_DATAVIEWCTRL)
m_markupText = nullptr;
#endif // SUPPORTS_MARKUP
#endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL
}
#endif //ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
@ -120,7 +120,11 @@ private:
std::function<bool()> can_create_editor_ctrl { nullptr };
#ifdef SUPPORTS_MARKUP
#ifdef wxHAS_GENERIC_DATAVIEWCTRL
class wxItemMarkupText* m_markupText;
#elseif
bool is_markupText;
#endif
#endif // SUPPORTS_MARKUP
};