GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 15:55:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore ability to use with wxWidgets 3.0

Browse Source 
Needed for FreeBSD GTK2 usage
This commit is contained in:
Stephen Hurd 2022-01-05 17:31:42 -05:00 committed by supermerill
parent 0da73fd854
commit c148bbc1bf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/FreeCADDialog.cpp
View File

@ -736,7 +736,9 @@ void FreeCADDialog::createSTC()
m_text->Bind(wxEVT_STC_CHARADDED, &FreeCADDialog::on_char_add, this);
m_text->Bind(wxEVT_KEY_DOWN, &FreeCADDialog::on_key_type, this);
m_text->Bind(wxEVT_CHAR, &FreeCADDialog::on_char_type, this);
#if (wxMAJOR_VERSION > 3) || (wxMAJOR_VERSION == 3 && wxMINOR_VERSION >= 1)
m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
#endif
m_text->Connect(wxID_ANY,
wxEVT_KEY_DOWN,
wxKeyEventHandler(FreeCADDialog::on_key_type),

2
src/slic3r/GUI/GUI_App.cpp
View File

@ -865,7 +865,7 @@ bool GUI_App::on_init_inner()
}
wxString artist;
if (!file_name.empty() && file_name != (std::string(SLIC3R_APP_NAME) + L(" icon"))) {
wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).string());
wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).string().c_str());
// make a bitmap with dark grey banner on the left side
bmp = SplashScreen::MakeBitmap(wxBitmap(splash_screen_path, wxBITMAP_TYPE_JPEG));