3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes to support wxWidgets 3.1.6(7), 3.2.0

Browse source 
+Updated URL and URL HASH for wxWidgets v3.2.0-patched
This commit is contained in:
YuSanka 2022-07-25 14:19:03 +02:00 • committed by Lukas Matena
parent 9a7e024f78
commit e21921f2eb
14 changed files with 93 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/KBShortcutsDialog.cpp
View file

@ -57,8 +57,8 @@ KBShortcutsDialog::KBShortcutsDialog()
void KBShortcutsDialog::on_dpi_changed(const wxRect& suggested_rect)
{
m_logo_bmp.msw_rescale();
m_header_bitmap->SetBitmap(m_logo_bmp.bmp());
//m_logo_bmp.msw_rescale();
//m_header_bitmap->SetBitmap(m_logo_bmp.bmp());
msw_buttons_rescale(this, em_unit(), { wxID_OK });
Layout();
@ -266,8 +266,10 @@ wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_f
sizer->AddStretchSpacer();
// logo
m_logo_bmp = ScalableBitmap(this, wxGetApp().logo_name(), 32);
m_header_bitmap = new wxStaticBitmap(panel, wxID_ANY, m_logo_bmp.bmp());
//m_logo_bmp = ScalableBitmap(this, wxGetApp().logo_name(), 32);
//m_header_bitmap = new wxStaticBitmap(panel, wxID_ANY, m_logo_bmp.bmp());
m_header_bitmap = new wxStaticBitmap(panel, wxID_ANY, wxBitmapBundle::FromSVGFile(Slic3r::var(wxGetApp().logo_name() + ".svg"), wxSize(32, 32)));
sizer->Add(m_header_bitmap, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
// text