mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-25 15:44:12 -06:00
Revert to WxWidgets 3.1.5 (#3249)
* revert to WxWidgets 3.1.5 * update nanosvg unicode path
This commit is contained in:
parent
cc23ec6626
commit
374f78c768
95 changed files with 6841 additions and 1618 deletions
|
@ -227,10 +227,10 @@ void MsgDialog::apply_style(long style)
|
|||
if (style & wxNO) add_button(wxID_NO, false,_L("No"));
|
||||
if (style & wxCANCEL) add_button(wxID_CANCEL, false, _L("Cancel"));
|
||||
|
||||
logo->SetBitmap( *get_bmp_bundle(style & wxAPPLY ? "completed" :
|
||||
logo->SetBitmap( create_scaled_bitmap(style & wxAPPLY ? "completed" :
|
||||
style & wxICON_WARNING ? "obj_warning" :
|
||||
style & wxICON_INFORMATION ? "info" :
|
||||
style & wxICON_QUESTION ? "question" : "OrcaSlicer", 64));
|
||||
style & wxICON_QUESTION ? "question" : "OrcaSlicer", this, 64, style & wxICON_ERROR));
|
||||
}
|
||||
|
||||
void MsgDialog::finalize()
|
||||
|
@ -339,7 +339,7 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg, bool monospaced_
|
|||
add_msg_content(this, content_sizer, msg, monospaced_font);
|
||||
|
||||
// Use a small bitmap with monospaced font, as the error text will not be wrapped.
|
||||
logo->SetBitmap(*get_bmp_bundle("OrcaSlicer_192px_grayscale.png", monospaced_font ? 48 : /*1*/84));
|
||||
logo->SetBitmap(create_scaled_bitmap("OrcaSlicer_192px_grayscale.png", this, monospaced_font ? 48 : /*1*/84));
|
||||
|
||||
SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue