X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcinema_dialog.h;h=32dd77264e07e9c5b56b64ec009bfa168db93f7d;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=2949d6c8c3eb27412ae004af159087923709a818;hpb=c74d789ed75e87bccd094f45f082674f8f8d2f2f;p=dcpomatic.git diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h index 2949d6c8c..32dd77264 100644 --- a/src/wx/cinema_dialog.h +++ b/src/wx/cinema_dialog.h @@ -1,42 +1,50 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include "table_dialog.h" + #include "editable_list.h" #include "email_dialog.h" +#include "table_dialog.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include #include + class CinemaDialog : public wxDialog { public: CinemaDialog ( wxWindow *, - std::string, + wxString, std::string name = "", std::list emails = std::list (), + std::string notes = "", int utc_offset_hour = 0, int utc_offset_minute = 0 ); std::string name () const; + std::string notes () const; std::list emails () const; int utc_offset_hour () const; int utc_offset_minute () const; @@ -46,22 +54,9 @@ private: void set_emails (std::vector); wxTextCtrl* _name; + wxTextCtrl* _notes; EditableList* _email_list; std::vector _emails; wxChoice* _utc_offset; - - struct Offset - { - Offset (wxString n, int h, int m) - : name (n) - , hour (h) - , minute (m) - {} - - wxString name; - int hour; - int minute; - }; - std::vector _offsets; };