Diff of /src/hugin1/stitch_project/hugin_stitch_project.cpp [6a1192] .. [261128] Maximize Restore

  Switch to side-by-side view

--- a/src/hugin1/stitch_project/hugin_stitch_project.cpp
+++ b/src/hugin1/stitch_project/hugin_stitch_project.cpp
@@ -134,7 +134,7 @@
 
 void RunStitchFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox( wxString::Format(_("HuginStitchProject. Application to stitch hugin project files.\n Version: %s"), wxT(DISPLAY_VERSION)),
+    wxMessageBox( wxString::Format(_("HuginStitchProject. Application to stitch hugin project files.\n Version: %s"), wxT(PACKAGE_VERSION)),
                   wxT("About hugin_stitch_project"),
                   wxOK | wxICON_INFORMATION );
 }
@@ -244,12 +244,7 @@
     // Required to access the preferences of hugin
     SetAppName(wxT("hugin"));
 
-#if defined __WXMSW__
-    int localeID = wxConfigBase::Get()->Read(wxT("language"), (long) wxLANGUAGE_DEFAULT);
-    m_locale.Init(localeID);
-#else
     m_locale.Init(wxLANGUAGE_DEFAULT);
-#endif
 
     // setup the environment for the different operating systems
 #if defined __WXMSW__
@@ -374,13 +369,6 @@
                          wxSAVE, wxDefaultPosition);
         dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")));
         if (dlg.ShowModal() == wxID_OK) {
-            while(containsInvalidCharacters(dlg.GetPath()))
-            {
-                wxMessageBox(wxString::Format(_("The given filename contains one of the following invalid characters: %s\nHugin can not work with this filename. Please enter a valid filename."),getInvalidCharacters().c_str()),
-                    _("Error"),wxOK | wxICON_EXCLAMATION);
-                if(dlg.ShowModal()!=wxID_OK)
-                    return false;
-            };
             wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later
             outname = dlg.GetPath();
         } else { // bail
@@ -408,7 +396,7 @@
 
     wxFileName basename(scriptFile);
     frame->SetTitle(wxString::Format(_("%s - Stitching"), basename.GetName().c_str()));
-    bool n = frame->StitchProject(scriptFile, outname, progs);
+    int n = frame->StitchProject(scriptFile, outname, progs);
     if (parser.Found(wxT("d")) ) {
         wxRemoveFile(scriptFile);
     }