projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
interop_metadata_dialog.h
diff --git
a/src/wx/interop_metadata_dialog.h
b/src/wx/interop_metadata_dialog.h
index b8a1a36e61c121d0c74e0f54b66a3c5033856805..fc1f9381dc7e5d5a1fc1edffda4f1c33c8553710 100644
(file)
--- a/
src/wx/interop_metadata_dialog.h
+++ b/
src/wx/interop_metadata_dialog.h
@@
-20,9
+20,13
@@
#include "editable_list.h"
#include "editable_list.h"
+#include "metadata_dialog.h"
+#include "lib/warnings.h"
#include <dcp/language_tag.h>
#include <dcp/types.h>
#include <dcp/language_tag.h>
#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <vector>
#include <vector>
@@
-31,17
+35,19
@@
class LanguageTagWidget;
class RatingDialog;
class RatingDialog;
-class InteropMetadataDialog : public
wx
Dialog
+class InteropMetadataDialog : public
Metadata
Dialog
{
public:
InteropMetadataDialog (wxWindow* parent, std::weak_ptr<Film> film);
private:
{
public:
InteropMetadataDialog (wxWindow* parent, std::weak_ptr<Film> film);
private:
- std::vector<dcp::Rating> ratings () const;
+ void setup_standard (wxPanel* panel, wxSizer* sizer) override;
+
void set_ratings (std::vector<dcp::Rating> r);
void content_version_changed ();
void set_ratings (std::vector<dcp::Rating> r);
void content_version_changed ();
- std::weak_ptr<Film> _film;
+ std::vector<dcp::Rating> ratings () const;
+
EditableList<dcp::Rating, RatingDialog>* _ratings;
wxTextCtrl* _content_version;
};
EditableList<dcp::Rating, RatingDialog>* _ratings;
wxTextCtrl* _content_version;
};