3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-04 13:57:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge 9fc00e8944 into 506fde8f86

Browse source
This commit is contained in:
Dima Buzdyk 2025-12-24 12:58:20 +08:00 • committed by GitHub
commit 9f37325e84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
deps/wxWidgets/wxWidgets.cmake vendored
View file

@ -26,7 +26,8 @@ endif ()
orcaslicer_add_cmake_project(
wxWidgets
GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
GIT_REPOSITORY "https://github.com/buzzhuzz/Orca-deps-wxWidgets.git"
GIT_TAG "updates/v3.2.6"
GIT_SHALLOW ON
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
${_wx_flatpak_patch}

6
src/slic3r/GUI/BitmapComboBox.cpp
View file

@ -91,8 +91,9 @@ BitmapComboBox::~BitmapComboBox()
}
#ifdef __APPLE__
bool BitmapComboBox::OnAddBitmap(const wxBitmap& bitmap)
bool BitmapComboBox::OnAddBitmap(const wxBitmapBundle& bundle)
{
wxBitmap bitmap = bundle.GetBitmap(wxDefaultSize);
if (bitmap.IsOk())
{
// we should use scaled! size values of bitmap
@ -131,7 +132,8 @@ void BitmapComboBox::OnDrawItem(wxDC& dc,
int item,
int flags) const
{
const wxBitmap& bmp = *(static_cast<wxBitmap*>(m_bitmaps[item]));
const wxBitmapBundle& bundle = m_bitmapbundles[item];
const wxBitmap bmp = bundle.GetBitmap(wxDefaultSize);
if (bmp.IsOk())
{
// we should use scaled! size values of bitmap

2
src/slic3r/GUI/BitmapComboBox.hpp
View file

@ -47,7 +47,7 @@ protected:
* For this purpose control drawing methods and
* control size calculation methods (virtual) are overridden.
**/
bool OnAddBitmap(const wxBitmap& bitmap) override;
bool OnAddBitmap(const wxBitmapBundle& bitmap) override;
void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const override;
#endif

2
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View file

@ -374,7 +374,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
// Always fill in the "printhost_port" combo box from the config and select it.
{
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
choice->set_values({ m_config->opt_string("printhost_port") });
choice->set_values(std::vector<std::string>{ m_config->opt_string("printhost_port") });
choice->set_selection();
}