X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnew_film_dialog.h;h=01064f2a6e2c1ad433c9dafce0b6342ed791ea8c;hb=7de09ede7bc6e34bea6ab3e7982efb51ca399b7d;hp=f8f3aa08dd1ca5f360afaa495299afd1d8470346;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h index f8f3aa08d..01064f2a6 100644 --- a/src/wx/new_film_dialog.h +++ b/src/wx/new_film_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,23 +20,24 @@ #include #include #include "wx_util.h" +#include "table_dialog.h" class DirPickerCtrl; -class NewFilmDialog : public wxDialog +class NewFilmDialog : public TableDialog { public: NewFilmDialog (wxWindow *); ~NewFilmDialog (); - std::string get_path () const; + boost::filesystem::path get_path () const; private: wxTextCtrl* _name; -#ifdef DCPOMATIC_USE_OWN_DIR_PICKER +#ifdef DCPOMATIC_USE_OWN_PICKER DirPickerCtrl* _folder; -#else +#else wxDirPickerCtrl* _folder; -#endif - static boost::optional _directory; +#endif + static boost::optional _directory; };