Some portability fixes.
authorCarl Hetherington <cth@carlh.net>
Sat, 16 Feb 2013 01:58:52 +0000 (01:58 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 16 Feb 2013 01:58:52 +0000 (01:58 +0000)
src/tools/dvdomatic.cc
src/wx/job_manager_view.cc

index bab49c2dcc8f9401c9a28d9124b8675ad4184e18..5d944a934fe6c54bbe35c1ae9f1bbfa6522a282e 100644 (file)
@@ -445,7 +445,7 @@ class App : public wxApp
                                film.reset (new Film (film_to_load));
                                film->log()->set_level (log_level);
                        } catch (exception& e) {
-                               error_dialog (0, String::compose ("Could not load film %1 (%2)", film_to_load, e.what()));
+                               error_dialog (0, std_to_wx (String::compose ("Could not load film %1 (%2)", film_to_load, e.what())));
                        }
                }
 
index a521f5b8066967eec672f788696c82509eb5dc28..8bede709f5f0bfd1df13ce36c02b46cbff40d2ea 100644 (file)
@@ -131,7 +131,7 @@ JobManagerView::details_clicked (wxCommandEvent& ev)
                if (i->second.details == o) {
                        string s = i->first->error_summary();
                        s[0] = toupper (s[0]);
-                       error_dialog (this, String::compose ("%1.\n\n%2", s, i->first->error_details()));
+                       error_dialog (this, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details())));
                }
        }
 }