diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-25 23:40:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-25 23:40:06 +0000 |
| commit | 984921524ed4a558b5bcf0a880f6585d1f14f2f9 (patch) | |
| tree | ce4d83bb777ef5448646d1a3b50839d4a4a65622 | |
| parent | cadf2d574d144098fffa3c61e0a2be88f496cac6 (diff) | |
More hacks.
| -rw-r--r-- | src/wx/new_film_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/new_film_dialog.h | 2 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index 2612a6afe..be5af999e 100644 --- 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 4176b060d..a835c7ceb 100644 --- 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 27a4554ca..103d36d00 100644 --- 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. |