From 66c89c62e26142f5ee068e49c6d8bce4af7fe800 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Fri, 5 Aug 2022 14:38:19 +0800 Subject: [PATCH] FIX: wxWidgets asserts Change-Id: I583edbde501c2bfe8adfa8fdb525479a379a4cb8 --- src/BambuStudio.cpp | 2 +- src/slic3r/GUI/BBLStatusBar.cpp | 4 ++-- src/slic3r/GUI/BBLTopbar.cpp | 4 ++-- src/slic3r/GUI/Calibration.cpp | 4 ++-- src/slic3r/GUI/DownloadProgressDialog.cpp | 2 +- src/slic3r/GUI/GUI_Factories.cpp | 4 ++-- src/slic3r/GUI/HMSPanel.cpp | 2 +- src/slic3r/GUI/MediaFilePanel.cpp | 4 ++-- src/slic3r/GUI/MediaPlayCtrl.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 4 ++-- src/slic3r/GUI/StatusPanel.cpp | 18 +++++++++--------- src/slic3r/GUI/Tab.cpp | 4 ++-- src/slic3r/GUI/UpgradePanel.cpp | 6 +++--- src/slic3r/GUI/Widgets/CheckBox.cpp | 13 ++++++++++--- src/slic3r/GUI/Widgets/ComboBox.hpp | 4 ++-- src/slic3r/GUI/Widgets/DropDown.hpp | 6 +++--- src/slic3r/GUI/WipeTowerDialog.cpp | 2 +- 17 files changed, 46 insertions(+), 39 deletions(-) diff --git a/src/BambuStudio.cpp b/src/BambuStudio.cpp index dc3a00a8f..6585ece0a 100644 --- a/src/BambuStudio.cpp +++ b/src/BambuStudio.cpp @@ -143,7 +143,7 @@ int CLI::run(int argc, char **argv) return 1; } BOOST_LOG_TRIVIAL(info) << "finished setup params, argc="<< argc << std::endl; - std::string temp_path = wxStandardPaths::Get().GetTempDir().utf8_str().data(); + std::string temp_path = wxFileName::GetTempDir().utf8_str().data(); set_temporary_dir(temp_path); m_extra_config.apply(m_config, true); diff --git a/src/slic3r/GUI/BBLStatusBar.cpp b/src/slic3r/GUI/BBLStatusBar.cpp index 3bc023619..e0cde171c 100644 --- a/src/slic3r/GUI/BBLStatusBar.cpp +++ b/src/slic3r/GUI/BBLStatusBar.cpp @@ -51,8 +51,8 @@ BBLStatusBar::BBLStatusBar(wxWindow *parent, int id) m_sizer->Add(m_object_info_sizer, 1, wxEXPAND | wxALL | wxALIGN_LEFT, 5); m_sizer->Add(m_slice_info_sizer, 1, wxEXPAND | wxALL | wxALIGN_LEFT, 5); m_sizer->Add(m_status_text, 1, wxEXPAND | wxALL | wxALIGN_LEFT, 5); - m_sizer->Add(m_prog, 0, wxEXPAND | wxLEFT | wxALL | wxALIGN_RIGHT, 5); - m_sizer->Add(m_cancelbutton, 0, wxEXPAND | wxALL | wxALIGN_RIGHT, 5); + m_sizer->Add(m_prog, 0, wxEXPAND | wxLEFT | wxALL, 5); + m_sizer->Add(m_cancelbutton, 0, wxEXPAND | wxALL, 5); m_sizer->SetSizeHints(m_self); m_self->SetSizer(m_sizer); diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp index d80fc478e..defc6d51e 100644 --- a/src/slic3r/GUI/BBLTopbar.cpp +++ b/src/slic3r/GUI/BBLTopbar.cpp @@ -245,7 +245,7 @@ void BBLTopbar::Init(wxFrame* parent) this->AddStretchSpacer(1); m_title_item = this->AddLabel(ID_TITLE, "", FromDIP(TOPBAR_TITLE_WIDTH)); - m_title_item->SetAlignment(wxCENTER); + m_title_item->SetAlignment(wxALIGN_CENTRE); this->AddSpacer(FromDIP(10)); this->AddStretchSpacer(1); @@ -407,7 +407,7 @@ void BBLTopbar::SetTitle(wxString title) title = wxControl::Ellipsize(title, dc, wxELLIPSIZE_END, FromDIP(TOPBAR_TITLE_WIDTH)); m_title_item->SetLabel(title); - m_title_item->SetAlignment(wxALIGN_CENTRE_HORIZONTAL); + m_title_item->SetAlignment(wxALIGN_CENTRE); this->Refresh(); } diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index 5994566be..8b10e1198 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -113,7 +113,7 @@ CalibrationDialog::CalibrationDialog(Plater *plater) calibration_panel->SetSizer(calibration_sizer); calibration_panel->Layout(); - calibration_sizer->Add(m_calibration_flow, 0, wxALIGN_CENTER_HORIZONTAL | wxEXPAND, 0); + calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0); StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); @@ -138,7 +138,7 @@ CalibrationDialog::CalibrationDialog(Plater *plater) cali_right_panel->SetSizer(cali_right_sizer_h); cali_right_panel->Layout(); - sizer_body->Add(cali_right_panel, 0, wxALIGN_CENTER_HORIZONTAL | wxEXPAND, 0); + sizer_body->Add(cali_right_panel, 0, wxEXPAND, 0); body_panel->SetSizer(sizer_body); body_panel->Layout(); diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index 2e7bbcef7..f1af5269d 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -44,7 +44,7 @@ DownloadProgressDialog::DownloadProgressDialog(wxString title) m_panel_download->SetSize(wxSize(FromDIP(340), -1)); m_panel_download->SetMinSize(wxSize(FromDIP(340), -1)); m_panel_download->SetMaxSize(wxSize(FromDIP(340), -1)); - m_sizer_main->Add(m_panel_download, 0, wxALIGN_CENTER_VERTICAL|wxALL, FromDIP(20)); + m_sizer_main->Add(m_panel_download, 0, wxALL, FromDIP(20)); m_sizer_main->Add(0, 0, 1, wxBOTTOM, 10); SetSizer(m_sizer_main); diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index d31132266..a4616f9ad 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -1392,8 +1392,8 @@ void MenuFactory::append_menu_item_locked(wxMenu* menu) m_parent->Bind(wxEVT_UPDATE_UI, [](wxUpdateUIEvent& evt) { PartPlate* plate = plater()->get_partplate_list().get_selected_plate(); assert(plate); - bool check = plate->is_locked(); - evt.Check(check); + //bool check = plate->is_locked(); + //evt.Check(check); plater()->set_current_canvas_as_dirty(); }, item->GetId()); } diff --git a/src/slic3r/GUI/HMSPanel.cpp b/src/slic3r/GUI/HMSPanel.cpp index ba3c86ade..e5336986b 100644 --- a/src/slic3r/GUI/HMSPanel.cpp +++ b/src/slic3r/GUI/HMSPanel.cpp @@ -25,7 +25,7 @@ HMSPanel::HMSPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wx m_scrolledWindow->SetSizerAndFit(m_top_sizer); - m_main_sizer->Add(m_scrolledWindow, 1, wxALIGN_CENTER_HORIZONTAL | wxEXPAND, 0); + m_main_sizer->Add(m_scrolledWindow, 1, wxEXPAND, 0); this->SetSizerAndFit(m_main_sizer); diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index 35974d44c..a6f1e81d4 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -45,7 +45,7 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent) time_sizer->Add(m_button_month, 0, wxALIGN_CENTER_VERTICAL); time_sizer->Add(m_button_all, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 24); m_time_panel->SetSizer(time_sizer); - top_sizer->Add(m_time_panel, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + top_sizer->Add(m_time_panel, 1, wxEXPAND); // File type m_type_panel = new ::StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); @@ -74,7 +74,7 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent) manage_sizer->Add(m_button_download, 0, wxALIGN_CENTER_VERTICAL)->Show(false); manage_sizer->Add(m_button_management, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 24); m_manage_panel->SetSizer(manage_sizer); - top_sizer->Add(m_manage_panel, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + top_sizer->Add(m_manage_panel, 1, wxEXPAND); sizer->Add(top_sizer, 0, wxEXPAND); diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index 4fa726013..6e37217d1 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -27,7 +27,7 @@ MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl2 *media_ctrl, const w Bind(wxEVT_RIGHT_UP, [this](auto & e) { wxClipboard & c = *wxTheClipboard; if (c.Open()) { c.SetData(new wxTextDataObject(m_url)); c.Close(); } }); wxBoxSizer * sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(m_button_play, 0, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 0); + sizer->Add(m_button_play, 0, wxEXPAND | wxALL, 0); sizer->AddStretchSpacer(1); sizer->Add(m_label_status, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(25)); SetSizer(sizer); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 7ff539ac5..394c57e39 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -522,7 +522,7 @@ Sidebar::Sidebar(Plater *parent) m_bed_type_list->Select(0); bed_type_sizer->Add(bed_type_title, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(10)); - bed_type_sizer->Add(m_bed_type_list, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL | wxEXPAND, FromDIP(10)); + bed_type_sizer->Add(m_bed_type_list, 1, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(10)); vsizer_printer->Add(bed_type_sizer, 0, wxEXPAND | wxTOP, FromDIP(5)); p->m_panel_printer_content->SetSizer(vsizer_printer); @@ -786,7 +786,7 @@ void Sidebar::init_filament_combo(PlaterPresetComboBox **combo, const int filame auto side = filament_idx % 2; auto /***/sizer_filaments = this->p->sizer_filaments->GetItem(side)->GetSizer(); if (side == 1 && filament_idx > 1) sizer_filaments->Remove(filament_idx / 2); - sizer_filaments->Add(combo_and_btn_sizer, 1, wxALIGN_CENTER | wxEXPAND); + sizer_filaments->Add(combo_and_btn_sizer, 1, wxEXPAND); if (side == 0) { sizer_filaments = this->p->sizer_filaments->GetItem(1)->GetSizer(); sizer_filaments->AddStretchSpacer(1); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index a36349fed..6bc464d1e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -249,8 +249,8 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page() m_media_play_ctrl = new MediaPlayCtrl(this, m_media_ctrl, wxDefaultPosition, wxSize(-1, FromDIP(40))); - sizer->Add(m_media_ctrl, 1, wxEXPAND | wxALIGN_CENTER_HORIZONTAL | wxALL, 0); - sizer->Add(m_media_play_ctrl, 0, wxEXPAND | wxALIGN_CENTER_HORIZONTAL | wxALL, 0); + sizer->Add(m_media_ctrl, 1, wxEXPAND | wxALL, 0); + sizer->Add(m_media_play_ctrl, 0, wxEXPAND | wxALL, 0); // media_ctrl_panel->SetSizer(bSizer_monitoring); // media_ctrl_panel->Layout(); // @@ -306,7 +306,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) bSizer_task_name->Add(m_staticText_subtask_value, 1, wxALL | wxEXPAND, 0); bSizer_task_name->Add(m_printing_stage_value, 1, wxALL | wxEXPAND, 0); - bSizer_subtask_info->Add(bSizer_task_name, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND, FromDIP(5)); + bSizer_subtask_info->Add(bSizer_task_name, 1, wxEXPAND, FromDIP(5)); /* wxFlexGridSizer *fgSizer_task = new wxFlexGridSizer(2, 2, 0, 0); fgSizer_task->AddGrowableCol(0); @@ -330,7 +330,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) //m_panel_progress->SetMinSize(wxSize(FromDIP(574), -1)); //m_panel_progress->SetMaxSize(wxSize(FromDIP(600), -1)); - m_sizer_progressbar->Add(m_gauge_progress, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND, 0); + m_sizer_progressbar->Add(m_gauge_progress, 1, wxALIGN_CENTER_VERTICAL, 0); //fgSizer_task->Add(m_panel_progress, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND, 0); wxBoxSizer *bSizer_task_btn = new wxBoxSizer(wxHORIZONTAL); @@ -609,7 +609,7 @@ wxBoxSizer *StatusBasePanel::create_temp_control(wxWindow *parent) wxBoxSizer *m_misc_ctrl_sizer = create_misc_control(parent); - sizer->Add(m_misc_ctrl_sizer, 0, wxEXPAND | wxALIGN_CENTER_VERTICAL, 0); + sizer->Add(m_misc_ctrl_sizer, 0, wxEXPAND, 0); return sizer; } @@ -751,7 +751,7 @@ wxBoxSizer *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_10->SetMinSize(Z_BUTTON_SIZE); m_bpButton_z_10->SetCornerRadius(0); - bSizer_z_ctrl->Add(m_bpButton_z_10, 0, wxEXPAND | wxALL | wxALIGN_CENTER_HORIZONTAL, 0); + bSizer_z_ctrl->Add(m_bpButton_z_10, 0, wxEXPAND | wxALL, 0); m_bpButton_z_1 = new Button(panel, wxString(" 1"), "monitor_bed_up", 0, FromDIP(15)); m_bpButton_z_1->SetFont(::Label::Body_13); @@ -761,7 +761,7 @@ wxBoxSizer *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_1->SetMinSize(Z_BUTTON_SIZE); m_bpButton_z_1->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_TEXT_COL, (int) StateColor::Normal))); - bSizer_z_ctrl->Add(m_bpButton_z_1, 0, wxEXPAND | wxALL | wxALIGN_CENTER_HORIZONTAL, 0); + bSizer_z_ctrl->Add(m_bpButton_z_1, 0, wxEXPAND | wxALL, 0); bSizer_z_ctrl->Add(0, FromDIP(6), 0, wxEXPAND, 0); @@ -773,7 +773,7 @@ wxBoxSizer *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_down_1->SetMinSize(Z_BUTTON_SIZE); m_bpButton_z_down_1->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_TEXT_COL, (int) StateColor::Normal))); - bSizer_z_ctrl->Add(m_bpButton_z_down_1, 0, wxEXPAND | wxALL | wxALIGN_CENTER_HORIZONTAL, 0); + bSizer_z_ctrl->Add(m_bpButton_z_down_1, 0, wxEXPAND | wxALL, 0); m_bpButton_z_down_10 = new Button(panel, wxString("10"), "monitor_bed_down", 0, FromDIP(15)); m_bpButton_z_down_10->SetFont(::Label::Body_13); @@ -783,7 +783,7 @@ wxBoxSizer *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_down_10->SetMinSize(Z_BUTTON_SIZE); m_bpButton_z_down_10->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_TEXT_COL, (int) StateColor::Normal))); - bSizer_z_ctrl->Add(m_bpButton_z_down_10, 0, wxEXPAND | wxALL | wxALIGN_CENTER_HORIZONTAL, 0); + bSizer_z_ctrl->Add(m_bpButton_z_down_10, 0, wxEXPAND | wxALL, 0); bSizer_z_ctrl->Add(0, FromDIP(16), 0, wxEXPAND, 0); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 9e43fb6dc..ebe3eca71 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -266,7 +266,7 @@ void Tab::create_preset_tab() m_search_input->SetFont(wxGetApp().bold_font()); search_sizer->Add(new wxWindow(m_search_item, wxID_ANY, wxDefaultPosition, wxSize(0, 0)), 0, wxEXPAND | wxLEFT, 16); - search_sizer->Add(m_search_input, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, wxGetApp().em_unit() / 2); + search_sizer->Add(m_search_input, 1, wxEXPAND | wxALL, wxGetApp().em_unit() / 2); search_sizer->Add(new wxWindow(m_search_input, wxID_ANY, wxDefaultPosition, wxSize(0, 0)), 0, wxEXPAND | wxLEFT, 16); @@ -334,7 +334,7 @@ void Tab::create_preset_tab() // BBS: model config if (m_presets_choice) { m_presets_choice->Reparent(m_top_panel); - m_top_sizer->Add(m_presets_choice, 1, wxLEFT | wxRIGHT | wxEXPAND | wxALIGN_CENTER_VERTICAL, 10); + m_top_sizer->Add(m_presets_choice, 1, wxLEFT | wxRIGHT | wxEXPAND, 10); } else { m_top_sizer->AddSpacer(10); m_top_sizer->AddStretchSpacer(1); diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 6cebb7bc2..0cfa9ac80 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -76,7 +76,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin m_staticText_ver = new wxStaticText(this, wxID_ANY, _L("Version:"), wxDefaultPosition, wxDefaultSize, 0); m_staticText_ver->Wrap(-1); m_staticText_ver->SetFont(Label::Head_14); - m_ota_ver_sizer->Add(m_staticText_ver, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); + m_ota_ver_sizer->Add(m_staticText_ver, 0, wxALL, FromDIP(5)); m_ota_info_sizer->Add(m_ota_ver_sizer, 0, wxEXPAND, 0); @@ -563,7 +563,7 @@ UpgradePanel::UpgradePanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, m_scrolledWindow->SetSizerAndFit(m_machine_list_sizer); - m_main_sizer->Add(m_scrolledWindow, 1, wxALIGN_CENTER_HORIZONTAL | wxEXPAND, 0); + m_main_sizer->Add(m_scrolledWindow, 1, wxEXPAND, 0); this->SetSizerAndFit(m_main_sizer); @@ -679,7 +679,7 @@ bool UpgradePanel::Show(bool show) auto m_staticText_ams_ver = new wxStaticText(this, wxID_ANY, _L("Version:"), wxDefaultPosition, wxDefaultSize, 0); m_staticText_ams_ver->Wrap(-1); m_staticText_ams_ver->SetFont(Label::Head_14); - m_ams_ver_sizer->Add(m_staticText_ams_ver, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); + m_ams_ver_sizer->Add(m_staticText_ams_ver, 0, wxALL, FromDIP(5)); m_staticText_ams_ver_val = new wxStaticText(this, wxID_ANY, "-", wxDefaultPosition, wxDefaultSize, 0); m_staticText_ams_ver_val->Wrap(-1); diff --git a/src/slic3r/GUI/Widgets/CheckBox.cpp b/src/slic3r/GUI/Widgets/CheckBox.cpp index e3858480e..4ca1ca5ba 100644 --- a/src/slic3r/GUI/Widgets/CheckBox.cpp +++ b/src/slic3r/GUI/Widgets/CheckBox.cpp @@ -43,9 +43,16 @@ void CheckBox::SetHalfChecked(bool value) void CheckBox::Rescale() { - m_on.msw_rescale(); - m_off.msw_rescale(); - SetSize(m_on.GetBmpSize()); + m_on.msw_rescale(); + m_half.msw_rescale(); + m_off.msw_rescale(); + m_on_disabled.msw_rescale(); + m_half_disabled.msw_rescale(); + m_off_disabled.msw_rescale(); + m_on_focused.msw_rescale(); + m_half_focused.msw_rescale(); + m_off_focused.msw_rescale(); + SetSize(m_on.GetBmpSize()); update(); } diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp index a15cd9ae1..0a8e018dc 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.hpp +++ b/src/slic3r/GUI/Widgets/ComboBox.hpp @@ -4,8 +4,8 @@ #include "TextInput.hpp" #include "DropDown.hpp" -#define CB_NO_DROP_ICON 0x1000000 -#define CB_NO_TEXT 0x2000000 +#define CB_NO_DROP_ICON DD_NO_CHECK_ICON +#define CB_NO_TEXT DD_NO_TEXT class ComboBox : public wxWindowWithItems { diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp index 03f91a05a..60a404b5d 100644 --- a/src/slic3r/GUI/Widgets/DropDown.hpp +++ b/src/slic3r/GUI/Widgets/DropDown.hpp @@ -5,9 +5,9 @@ #include "../wxExtensions.hpp" #include "StateHandler.hpp" -#define DD_NO_CHECK_ICON 0x1000000 -#define DD_NO_TEXT 0x2000000 -#define DD_STYLE_MASK 0x3000000 +#define DD_NO_CHECK_ICON 0x0001 +#define DD_NO_TEXT 0x0002 +#define DD_STYLE_MASK 0x0003 wxDECLARE_EVENT(EVT_DISMISS, wxCommandEvent); diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index e2f552e97..a94d3d7c7 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -318,7 +318,7 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector& matrix, con param_sizer->Add(m_flush_multiplier_ebox); param_sizer->AddStretchSpacer(1); - m_sizer_advanced->Add(param_sizer, 0, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 10); + m_sizer_advanced->Add(param_sizer, 0, wxTOP | wxBOTTOM, 10); } m_page_advanced->Hide();