projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in string (thanks MichaĆ Tomaszewski)
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index aca8181184b596c7d02b2c9391f3bd984f9b0f6e..d6c81a8d2a794b5cf1fa9867f24c3bce379402d2 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-22,25
+22,28
@@
#include "content_menu.h"
#include "lib/film.h"
#include "lib/types.h"
#include "content_menu.h"
#include "lib/film.h"
#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/splitter.h>
#include <wx/splitter.h>
+LIBDCP_ENABLE_WARNINGS
#include <list>
#include <list>
+class AudioPanel;
+class ContentSubPanel;
+class Film;
+class FilmEditor;
+class FilmViewer;
+class TextPanel;
+class TimelineDialog;
+class TimingPanel;
+class VideoPanel;
+class wxListCtrl;
+class wxListEvent;
class wxNotebook;
class wxPanel;
class wxSizer;
class wxNotebook;
class wxPanel;
class wxSizer;
-class wxListCtrl;
-class wxListEvent;
class wxSplitterWindow;
class wxSplitterWindow;
-class TimelineDialog;
-class FilmEditor;
-class ContentSubPanel;
-class TextPanel;
-class VideoPanel;
-class AudioPanel;
-class TimingPanel;
-class Film;
-class FilmViewer;
class LimitedSplitter : public wxSplitterWindow
class LimitedSplitter : public wxSplitterWindow
@@
-48,7
+51,7
@@
class LimitedSplitter : public wxSplitterWindow
public:
LimitedSplitter (wxWindow* parent);
public:
LimitedSplitter (wxWindow* parent);
- bool OnSashPositionChange (int new_position)
+ bool OnSashPositionChange (int new_position)
override
{
/* Try to stop the top bit of the splitter getting so small that buttons disappear */
return new_position > 220;
{
/* Try to stop the top bit of the splitter getting so small that buttons disappear */
return new_position > 220;
@@
-126,7
+129,7
@@
private:
void setup ();
void setup_sensitivity ();
void setup ();
void setup_sensitivity ();
- void add_files (std::
list
<boost::filesystem::path>);
+ void add_files (std::
vector
<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;