diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp index 754a78e3b..c02788ff6 100644 --- a/src/slic3r/GUI/FreeCADDialog.cpp +++ b/src/slic3r/GUI/FreeCADDialog.cpp @@ -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), diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4bc3360e5..52a04af5c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -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));