FIX:clear wxwidgets asset

jira: nojia
Change-Id: I8ba2849afa07bc162a55b326c3d9a45150243ac3
(cherry picked from commit 96ba14c86d3cf180eeb585185d31bcb5d5db7415)

src/slic3r/GUI/CalibrationWizardPresetPage.cpp

@@ -1124,8 +1124,8 @@ void CalibrationPresetPage::create_multi_extruder_filament_list_panel(wxWindow *
     if (m_main_extruder_on_left) {
         m_main_sizer->GetStaticBox()->SetLabel(_L("Left Nozzle"));
         m_deputy_sizer->GetStaticBox()->SetLabel(_L("Right Nozzle"));
-        m_multi_exturder_ams_sizer->Add(m_main_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10);
+        m_multi_exturder_ams_sizer->Add(m_main_sizer, 1, wxALL | wxALIGN_BOTTOM, 10);
-        m_multi_exturder_ams_sizer->Add(m_deputy_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10);
+        m_multi_exturder_ams_sizer->Add(m_deputy_sizer, 1, wxALL | wxALIGN_BOTTOM, 10);
     }
     else {
         m_main_sizer->GetStaticBox()->SetLabel(_L("Right Nozzle"));
@@ -1210,7 +1210,8 @@ void CalibrationPresetPage::create_page(wxWindow* parent)
     m_top_sizer->Add(m_selection_panel, 0);
     m_top_sizer->Add(m_filament_list_panel, 0);
     m_top_sizer->Add(m_multi_exutrder_filament_list_panel, 0);
-    m_top_sizer->Add(m_pa_cali_method_combox, 0);
+    if (m_pa_cali_method_combox)
+        m_top_sizer->Add(m_pa_cali_method_combox, 0);
     m_top_sizer->Add(m_custom_range_panel, 0);
     m_top_sizer->AddSpacer(FromDIP(15));
     m_top_sizer->Add(m_warning_panel, 0);

src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp

@@ -43,7 +43,7 @@ void uiAmsPercentHumidityDryPopup::Create()
     title->SetFont(Label::Head_18);
 
     title_sizer->AddStretchSpacer();
-    title_sizer->Add(title, 0, wxALIGN_CENTER_HORIZONTAL);
+    title_sizer->Add(title, 0);
     title_sizer->AddStretchSpacer();
 
     // create humidity image

src/slic3r/GUI/FilamentGroupPopup.cpp

@@ -127,7 +127,7 @@ FilamentGroupPopup::FilamentGroupPopup(wxWindow *parent) : PopupWindow(parent, w
         detail_infos[idx]->Wrap(FromDIP(320));
 
         label_sizer->AddSpacer(radio_btns[idx]->GetRect().width + ratio_spacing);
-        label_sizer->Add(detail_infos[idx], 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
+        label_sizer->Add(detail_infos[idx], 1, wxALIGN_CENTER_VERTICAL);
 
         top_sizer->Add(button_sizer, 0, wxLEFT | wxRIGHT, horizontal_margin);
         top_sizer->Add(label_sizer, 0, wxLEFT | wxRIGHT, horizontal_margin);

src/slic3r/GUI/GUI_App.cpp

@@ -2396,6 +2396,11 @@ bool GUI_App::on_init_inner()
     BOOST_LOG_TRIVIAL(info) << boost::format("gui mode, Current OrcaSlicer Version %1%")%SoftFever_VERSION;
     BOOST_LOG_TRIVIAL(info) << get_system_info();
 
+// initialize label colors and fonts
+    init_label_colours();
+    init_fonts();
+    wxGetApp().Update_dark_mode_flag();
+    
 #if defined(__WINDOWS__)
     HMODULE hKernel32 = GetModuleHandleW(L"kernel32.dll");
     m_is_arm64 = false;
@@ -2470,10 +2475,6 @@ bool GUI_App::on_init_inner()
 #endif // __WINDOWS__
 
 #endif
-    // initialize label colors and fonts
-    init_label_colours();
-    init_fonts();
-    wxGetApp().Update_dark_mode_flag();
 
 
 #ifdef _MSW_DARK_MODE

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -100,7 +100,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     m_panel_down_road->SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR);
 
     m_down_road = new AMSRoadDownPart(m_panel_down_road, wxID_ANY, wxDefaultPosition, AMS_DOWN_ROAD_SIZE);
-    m_sizer_down_road->Add(m_panel_down_road, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, 0);
+    m_sizer_down_road->Add(m_panel_down_road, 0, wxTOP, 0);
 
     // ams mode
     //
@@ -228,11 +228,11 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     m_panel_option_left->Layout();
     m_panel_option_right->Layout();
 
-    m_sizer_ams_option->Add(m_panel_option_left, 0, wxALIGN_LEFT, 0);
+    m_sizer_ams_option->Add(m_panel_option_left, 0, wxALIGN_TOP, 0);
     m_sizer_ams_option->Add( 0, 0, 1, wxEXPAND, 0);
-    m_sizer_ams_option->Add(m_sizer_option_mid, 0, wxALIGN_RIGHT, 0);
+    m_sizer_ams_option->Add(m_sizer_option_mid, 0, wxALIGN_TOP, 0);
     m_sizer_ams_option->Add( 0, 0, 1, wxEXPAND, 0);
-    m_sizer_ams_option->Add(m_panel_option_right, 0, wxALIGN_RIGHT, 0);
+    m_sizer_ams_option->Add(m_panel_option_right, 0, wxALIGN_TOP, 0);
 
 
     m_sizer_ams_body->Add(m_sizer_ams_area_left, wxALIGN_CENTER, 0);

src/slic3r/GUI/Widgets/DropDown.cpp

@@ -191,6 +191,8 @@ void DropDown::paintNow()
 
 static wxSize GetBmpSize(wxBitmap & bmp)
 {
+    if (!bmp.IsOk())
+        return wxSize(0, 0);
 #ifdef __APPLE__
     return bmp.GetScaledSize();
 #else

src/slic3r/GUI/Widgets/SideTools.cpp

@@ -328,7 +328,7 @@ SideTools::SideTools(wxWindow *parent, wxWindowID id, const wxPoint &pos, const
     wxBoxSizer* sizer_error_desc = new wxBoxSizer(wxHORIZONTAL);
     wxBoxSizer* sizer_extra_info = new wxBoxSizer(wxHORIZONTAL);
 
-    m_link_network_state = new wxHyperlinkCtrl(m_side_error_panel, wxID_ANY,_L("Check the status of current system services"),"",wxDefaultPosition,wxDefaultSize,wxALIGN_CENTER_HORIZONTAL | wxST_ELLIPSIZE_END);
+    m_link_network_state = new wxHyperlinkCtrl(m_side_error_panel, wxID_ANY,_L("Check the status of current system services"),"",wxDefaultPosition,wxDefaultSize, wxHL_ALIGN_CENTRE |wxST_ELLIPSIZE_END);
     m_link_network_state->SetMinSize(wxSize(FromDIP(220), -1));
     m_link_network_state->SetMaxSize(wxSize(FromDIP(220), -1));
     m_link_network_state->SetFont(::Label::Body_12);

src/slic3r/GUI/wxExtensions.cpp

@@ -1034,6 +1034,8 @@ wxSize ScalableBitmap::GetBmpSize(const wxBitmap &bmp)
 
 int ScalableBitmap::GetBmpWidth() const
 {
+    if (!m_bmp.IsOk())
+        return 0;
 #ifdef __APPLE__
     return m_bmp.GetScaledWidth();
 #else
@@ -1043,6 +1045,8 @@ int ScalableBitmap::GetBmpWidth() const
 
 int ScalableBitmap::GetBmpHeight() const
 {
+    if (!m_bmp.IsOk())
+        return 0;
 #ifdef __APPLE__
     return m_bmp.GetScaledHeight();
 #else