projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
content_panel.cc
diff --git
a/src/wx/content_panel.cc
b/src/wx/content_panel.cc
index 5ec503720ca91ce0f8875bb7470ae611adbe9982..f93b0d471dd09c72dcf1ef8ca8095662c81fdaa8 100644
(file)
--- a/
src/wx/content_panel.cc
+++ b/
src/wx/content_panel.cc
@@
-45,20
+45,20
@@
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "lib/video_content.h"
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "lib/video_content.h"
-#include <wx/wx.h>
-#include <wx/notebook.h>
-#include <wx/listctrl.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/display.h>
#include <wx/display.h>
+#include <wx/listctrl.h>
+#include <wx/notebook.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-#include <iostream>
-using std::cout;
using std::dynamic_pointer_cast;
using std::exception;
using std::list;
using std::make_shared;
using std::dynamic_pointer_cast;
using std::exception;
using std::list;
using std::make_shared;
-using std::max;
using std::shared_ptr;
using std::string;
using std::vector;
using std::shared_ptr;
using std::string;
using std::vector;
@@
-105,11
+105,11
@@
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
_add_folder = new Button (_top_panel, _("Add folder..."));
_add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
_add_folder = new Button (_top_panel, _("Add folder..."));
_add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
- b->Add (_add_folder,
1
, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+ b->Add (_add_folder,
0
, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
_add_dcp = new Button (_top_panel, _("Add DCP..."));
_add_dcp->SetToolTip (_("Add a DCP."));
_add_dcp = new Button (_top_panel, _("Add DCP..."));
_add_dcp->SetToolTip (_("Add a DCP."));
- b->Add (_add_dcp,
1
, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+ b->Add (_add_dcp,
0
, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
_remove = new Button (_top_panel, _("Remove"));
_remove->SetToolTip (_("Remove the selected piece of content from the film."));
_remove = new Button (_top_panel, _("Remove"));
_remove->SetToolTip (_("Remove the selected piece of content from the film."));