supermerill 5 years ago
parent
commit
01e61068da
2 changed files with 6 additions and 6 deletions
  1. 2 2
      src/build-utils/encoding-check.cpp
  2. 4 4
      src/slic3r/GUI/MainFrame.cpp

+ 2 - 2
src/build-utils/encoding-check.cpp

@@ -87,9 +87,9 @@ int main(int argc, char const *argv[])
     };
 
     std::ifstream file(filename, std::ios::binary | std::ios::ate);
-    const auto size = file.tellg();
+    const std::streampos size = file.tellg();
 
-    if (size == 0) {
+    if (size == std::streampos{ 0 }) {
         return 0;
     }
 

+ 4 - 4
src/slic3r/GUI/MainFrame.cpp

@@ -668,12 +668,12 @@ void MainFrame::init_menubar()
 //#            wxTheApp->check_version(1);
 //#        });
 //#        $versioncheck->Enable(wxTheApp->have_version_check);
-        append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("%s &Website")), SLIC3R_APP_NAME), 
-                                             wxString::Format(_(L("Open the %s website in your browser")), SLIC3R_APP_NAME),
-            [this](wxCommandEvent&) { wxGetApp().open_web_page_localized("https://www.prusa3d.com/slicerweb"); });
+        append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("Slic3r Website"))), 
+                                             wxString::Format(_(L("Open the Slic3r website in your browser"))),
+//            [this](wxCommandEvent&) { wxGetApp().open_web_page_localized("https://www.prusa3d.com/slicerweb"); });
 //        append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("%s &Manual")), SLIC3R_APP_NAME),
 //                                             wxString::Format(_(L("Open the %s manual in your browser")), SLIC3R_APP_NAME),
-//            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://manual.slic3r.org/"); });
+            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://manual.slic3r.org/"); });
         helpMenu->AppendSeparator();
         append_menu_item(helpMenu, wxID_ANY, _(L("System &Info")), _(L("Show system information")), 
             [this](wxCommandEvent&) { wxGetApp().system_info(); });