projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add assert.
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index e9f942d094e4e322eafa593745717cc94030fd84..761b34a24113d97d82ce1715e36eb427a0a55049 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,17
+18,19
@@
*/
*/
-#include <list>
-#include <boost/shared_ptr.hpp>
+#include "content_menu.h"
#include "lib/types.h"
#include "lib/film.h"
#include "lib/types.h"
#include "lib/film.h"
-#include "content_menu.h"
+#include <wx/splitter.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
class wxNotebook;
class wxPanel;
class wxSizer;
class wxListCtrl;
class wxListEvent;
class wxNotebook;
class wxPanel;
class wxSizer;
class wxListCtrl;
class wxListEvent;
+class wxSplitterWindow;
class TimelineDialog;
class FilmEditor;
class ContentSubPanel;
class TimelineDialog;
class FilmEditor;
class ContentSubPanel;
@@
-37,12
+39,12
@@
class VideoPanel;
class AudioPanel;
class TimingPanel;
class Film;
class AudioPanel;
class TimingPanel;
class Film;
-class
Control
FilmViewer;
+class FilmViewer;
class ContentPanel : public boost::noncopyable
{
public:
class ContentPanel : public boost::noncopyable
{
public:
- ContentPanel (wxNotebook *, boost::shared_ptr<Film>,
ControlFilmViewer*
viewer);
+ ContentPanel (wxNotebook *, boost::shared_ptr<Film>,
boost::weak_ptr<FilmViewer>
viewer);
boost::shared_ptr<Film> film () const {
return _film;
boost::shared_ptr<Film> film () const {
return _film;
@@
-56,8
+58,8
@@
public:
void film_changed (Film::Property p);
void film_content_changed (int p);
void film_changed (Film::Property p);
void film_content_changed (int p);
- wx
Panel* panel
() const {
- return _
panel
;
+ wx
Window* window
() const {
+ return _
splitter
;
}
wxNotebook* notebook () const {
}
wxNotebook* notebook () const {
@@
-74,7
+76,7
@@
public:
bool remove_clicked (bool hotkey);
void timeline_clicked ();
bool remove_clicked (bool hotkey);
void timeline_clicked ();
-
ControlFilmViewer*
film_viewer () const {
+
boost::weak_ptr<FilmViewer>
film_viewer () const {
return _film_viewer;
}
return _film_viewer;
}
@@
-98,8
+100,7
@@
private:
void add_files (std::list<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
void add_files (std::list<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
- wxPanel* _panel;
- wxSizer* _sizer;
+ wxSplitterWindow* _splitter;
wxNotebook* _notebook;
wxListCtrl* _content;
wxButton* _add_file;
wxNotebook* _notebook;
wxListCtrl* _content;
wxButton* _add_file;
@@
-120,7
+121,8
@@
private:
wxWindow* _last_selected_tab;
boost::shared_ptr<Film> _film;
wxWindow* _last_selected_tab;
boost::shared_ptr<Film> _film;
-
ControlFilmViewer*
_film_viewer;
+
boost::weak_ptr<FilmViewer>
_film_viewer;
bool _generally_sensitive;
bool _ignore_deselect;
bool _generally_sensitive;
bool _ignore_deselect;
+ bool _no_check_selection;
};
};