projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use enum class for Film::Property.
[dcpomatic.git]
/
src
/
wx
/
hints_dialog.h
diff --git
a/src/wx/hints_dialog.h
b/src/wx/hints_dialog.h
index 83510643a3be2264a54766efafbe7549a098aad2..9124d5c13e9e7fc9d95ab73d3d61bde698ab8889 100644
(file)
--- a/
src/wx/hints_dialog.h
+++ b/
src/wx/hints_dialog.h
@@
-18,11
+18,15
@@
*/
*/
-#include "lib/types.h"
+
+#include "lib/change_signaller.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-#include <boost/weak_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
class wxRichTextCtrl;
class Film;
class Hints;
class wxRichTextCtrl;
class Film;
class Hints;
@@
-30,10
+34,10
@@
class Hints;
class HintsDialog : public wxDialog
{
public:
class HintsDialog : public wxDialog
{
public:
- HintsDialog (wxWindow* parent,
boost
::weak_ptr<Film>, bool ok);
+ HintsDialog (wxWindow* parent,
std
::weak_ptr<Film>, bool ok);
private:
private:
- void film_change
d (
);
+ void film_change
(ChangeType
);
void film_content_change (ChangeType type);
void shut_up (wxCommandEvent& ev);
void update ();
void film_content_change (ChangeType type);
void shut_up (wxCommandEvent& ev);
void update ();
@@
-42,13
+46,14
@@
private:
void finished ();
void progress (std::string m);
void finished ();
void progress (std::string m);
-
boost
::weak_ptr<Film> _film;
+
std
::weak_ptr<Film> _film;
wxGauge* _gauge;
wxStaticText* _gauge_message;
wxRichTextCtrl* _text;
wxGauge* _gauge;
wxStaticText* _gauge_message;
wxRichTextCtrl* _text;
- boost::s
har
ed_ptr<Hints> _hints;
+ boost::s
cop
ed_ptr<Hints> _hints;
std::list<std::string> _current;
std::list<std::string> _current;
+ bool _finished;
- boost::signals2::scoped_connection _film_change
d
_connection;
- boost::signals2::scoped_connection _film_content_change
d
_connection;
+ boost::signals2::scoped_connection _film_change_connection;
+ boost::signals2::scoped_connection _film_content_change_connection;
};
};