3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactoring:

Browse source 
1. Use C++ style cast instead of C style
2. Deleted unused code from Search
This commit is contained in:
YuSanka 2020-11-26 13:45:30 +01:00
parent d9be78d4cb
commit 7f22ce63f6
18 changed files with 110 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/OptionsGroup.cpp
View file

@ -111,6 +111,11 @@ OptionsGroup::OptionsGroup( wxWindow* _parent, const wxString& title,
{
}
wxWindow* OptionsGroup::ctrl_parent() const
{
return this->custom_ctrl && m_use_custom_ctrl_as_parent ? static_cast<wxWindow*>(this->custom_ctrl) : (this->stb ? static_cast<wxWindow*>(this->stb) : this->parent());
}
bool OptionsGroup::is_legend_line()
{
if (m_lines.size() == 1) {
@ -209,7 +214,7 @@ void OptionsGroup::activate_line(Line& line)
bool is_legend_line = option_set.front().opt.gui_type == "legend";
if (!custom_ctrl && m_use_custom_ctrl) {
custom_ctrl = new OG_CustomCtrl(is_legend_line ? this->parent() : (wxWindow*)this->stb, this);
custom_ctrl = new OG_CustomCtrl(is_legend_line ? this->parent() : static_cast<wxWindow*>(this->stb), this);
if (is_legend_line)
sizer->Add(custom_ctrl, 0, wxEXPAND | wxLEFT, wxOSX ? 0 : 10);
else