From e8895c16f36b0bb2a12b20a549016aa79a37c31f Mon Sep 17 00:00:00 2001 From: thysson2701 Date: Thu, 11 Jun 2026 22:34:40 +0200 Subject: [PATCH] =?UTF-8?q?fix(stable):=20wx=203.3.2=20StateHandler::attac?= =?UTF-8?q?h=20Initialisiererlisten-Ambiguit=C3=A4t=20(10=20Dateien)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slic3r/GUI/TabButton.cpp | 2 +- src/slic3r/GUI/Widgets/AxisCtrlButton.cpp | 2 +- src/slic3r/GUI/Widgets/Button.cpp | 2 +- src/slic3r/GUI/Widgets/DropDown.cpp | 2 +- src/slic3r/GUI/Widgets/LabeledStaticBox.cpp | 2 +- src/slic3r/GUI/Widgets/SideButton.cpp | 2 +- src/slic3r/GUI/Widgets/SpinInput.cpp | 2 +- src/slic3r/GUI/Widgets/StaticBox.cpp | 2 +- src/slic3r/GUI/Widgets/TempInput.cpp | 2 +- src/slic3r/GUI/Widgets/TextInput.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index 11da9db0690..439239103d8 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -44,7 +44,7 @@ bool TabButton::Create(wxWindow *parent, wxString text, ScalableBitmap &bmp, lon { StaticBox::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style); newtag_img = ScalableBitmap(this, "monitor_hms_new",7); - state_handler.attach({&text_color, &border_color}); + state_handler.attach(std::vector{&text_color, &border_color}); state_handler.update_binds(); //BBS set default font SetFont(Label::Body_14); diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp index ee0608ffbe3..8db7b7b7069 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp @@ -56,7 +56,7 @@ AxisCtrlButton::AxisCtrlButton(wxWindow *parent, ScalableBitmap &icon, long stly inner_background_color.append(BUTTON_IN_BG_COL, StateColor::Normal); inner_background_color.append(BUTTON_IN_BG_COL, StateColor::Enabled); - state_handler.attach({ &border_color, &background_color }); + state_handler.attach(std::vector{ &border_color, &background_color }); state_handler.update_binds(); } diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index ef5eb4b339a..f096fbe53c1 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -48,7 +48,7 @@ Button::Button(wxWindow* parent, wxString text, wxString icon, long style, int i bool Button::Create(wxWindow* parent, wxString text, wxString icon, long style, int iconSize, wxWindowID btn_id) { StaticBox::Create(parent, btn_id, wxDefaultPosition, wxDefaultSize, style); - state_handler.attach({&text_color}); + state_handler.attach(std::vector{&text_color}); state_handler.update_binds(); //BBS set default font SetFont(Label::Body_14); diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp index 04807f374d6..15ecc3eedee 100644 --- a/src/slic3r/GUI/Widgets/DropDown.cpp +++ b/src/slic3r/GUI/Widgets/DropDown.cpp @@ -57,7 +57,7 @@ void DropDown::Create(wxWindow *parent, long style) PopupWindow::Create(parent, wxPU_CONTAINS_CONTROLS); SetBackgroundStyle(wxBG_STYLE_PAINT); SetBackgroundColour(*wxWHITE); - state_handler.attach({&border_color, &text_color, &selector_border_color, &selector_background_color}); + state_handler.attach(std::vector{&border_color, &text_color, &selector_border_color, &selector_background_color}); state_handler.update_binds(); if ((style & DD_NO_CHECK_ICON) == 0) check_bitmap = ScalableBitmap(this, "checked", 16); diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp index c8e054593f0..86365953d40 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp @@ -66,7 +66,7 @@ bool LabeledStaticBox::Create( PickDC(dc); })); - state_handler.attach({&text_color, &background_color, &border_color}); + state_handler.attach(std::vector{&text_color, &background_color, &border_color}); state_handler.update_binds(); #ifndef __WXOSX__ SetBackgroundStyle(wxBG_STYLE_PAINT); diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp index 7d600ef3109..3a8ffe56c91 100644 --- a/src/slic3r/GUI/Widgets/SideButton.cpp +++ b/src/slic3r/GUI/Widgets/SideButton.cpp @@ -45,7 +45,7 @@ SideButton::SideButton(wxWindow* parent, wxString text, wxString icon, long stly SetBottomColour(wxColour("#3B4446")); - state_handler.attach({ &border_color, &text_color, &background_color }); + state_handler.attach(std::vector{ &border_color, &text_color, &background_color }); state_handler.update_binds(); // icon only diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp index ccd7a804479..52efcda7654 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.cpp +++ b/src/slic3r/GUI/Widgets/SpinInput.cpp @@ -55,7 +55,7 @@ void SpinInput::Create(wxWindow *parent, StaticBox::Create(parent, wxID_ANY, pos, size); SetFont(Label::Body_12); wxWindow::SetLabel(label); - state_handler.attach({&label_color, &text_color}); + state_handler.attach(std::vector{&label_color, &text_color}); state_handler.update_binds(); text_ctrl = new TextCtrl(this, wxID_ANY, text, {20, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER, wxTextValidator(wxFILTER_DIGITS)); text_ctrl->SetFont(Label::Body_14); diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp index 753cb102893..61f8aa05408 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.cpp +++ b/src/slic3r/GUI/Widgets/StaticBox.cpp @@ -40,7 +40,7 @@ bool StaticBox::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos, cons if (style & wxBORDER_NONE) border_width = 0; wxWindow::Create(parent, id, pos, size, style); - state_handler.attach({&border_color, &background_color, &background_color2}); + state_handler.attach(std::vector{&border_color, &background_color, &background_color2}); state_handler.update_binds(); SetBackgroundColour(GetParentBackgroundColor(parent)); return true; diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp index 6a9809252a3..7d7aec4f11a 100644 --- a/src/slic3r/GUI/Widgets/TempInput.cpp +++ b/src/slic3r/GUI/Widgets/TempInput.cpp @@ -84,7 +84,7 @@ void TempInput::Create(wxWindow *parent, wxString text, wxString label, wxString StaticBox::Create(parent, wxID_ANY, pos, size, style); wxWindow::SetLabel(label); style &= ~wxALIGN_CENTER_HORIZONTAL; - state_handler.attach({&label_color, &text_color}); + state_handler.attach(std::vector{&label_color, &text_color}); state_handler.update_binds(); text_ctrl = new wxTextCtrl(this, wxID_ANY, text, {5, 5}, wxDefaultSize, wxTE_PROCESS_ENTER | wxBORDER_NONE, wxTextValidator(wxFILTER_NUMERIC), wxTextCtrlNameStr); text_ctrl->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp index 362e4c99b3e..bc45f58db33 100644 --- a/src/slic3r/GUI/Widgets/TextInput.cpp +++ b/src/slic3r/GUI/Widgets/TextInput.cpp @@ -57,7 +57,7 @@ void TextInput::Create(wxWindow * parent, wxWindow::SetLabel(label); assert((style & wxRIGHT) == 0); style &= ~wxALIGN_MASK; - state_handler.attach({&label_color, & text_color}); + state_handler.attach(std::vector{&label_color, & text_color}); state_handler.update_binds(); text_ctrl = new TextCtrl(this, wxID_ANY, text, {4, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER); text_ctrl->SetFont(Label::Body_14);