After-merge bug fixing

This commit is contained in:
YuSanka 2018-11-01 14:02:38 +01:00
parent ba8a2e11b8
commit c135f4a1f8
3 changed files with 7 additions and 67 deletions
src/slic3r/GUI

View file

@ -18,9 +18,7 @@ namespace Slic3r
namespace GUI
{
#if ENABLE_EXTENDED_SELECTION
wxDEFINE_EVENT(EVT_OBJ_LIST_OBJECT_SELECT, SimpleEvent);
#endif // ENABLE_EXTENDED_SELECTION
wxDEFINE_EVENT(EVT_OBJ_LIST_OBJECT_SELECT, SimpleEvent);
ObjectList::ObjectList(wxWindow* parent) :
wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE)