More hacks.

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 2612a6afe9afabc987847dcbc0a1547ca6c43850..be5af999e86ca42861f1b9fd73e8563962037dab 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -74,11 +74,11 @@ NewFilmDialog::~NewFilmDialog ()
        _directory = wx_to_std (_folder->GetPath ());
 }
 
-string
+boost::filesystem::path
 NewFilmDialog::get_path () const
 {
        filesystem::path p;
        p /= wx_to_std (_folder->GetPath ());
        p /= wx_to_std (_name->GetValue ());
-       return p.string ();
+       return p;
 }

diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 4176b060df1dc9081c4afa80c39f11bbff35da35..a835c7cebae4ebbfe251eb85d29af30c5120bffe 100644 (file)
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -29,7 +29,7 @@ public:
        NewFilmDialog (wxWindow *);
        ~NewFilmDialog ();
 
-       std::string get_path () const;
+       boost::filesystem::path get_path () const;
 
 private:
        wxTextCtrl* _name;

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 27a4554ca61d5534994cbd6f794c1f289a44060c..103d36d006d1539043f8c357fae1ebdf98ceb0f7 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -105,7 +105,7 @@ confirm_dialog (wxWindow* parent, wxString m)
 string
 wx_to_std (wxString s)
 {
-       return string (s.mb_str ());
+       return string (s.ToUTF8 ());
 }
 
 /** @param s STL string.