projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an assert.
[dcpomatic.git]
/
src
/
wx
/
fonts_dialog.h
diff --git
a/src/wx/fonts_dialog.h
b/src/wx/fonts_dialog.h
index 723414a6baee836dce224936d248277001adfb7b..c741131c41c4cd707a7aea7e3e1aa2eab0049dfc 100644
(file)
--- a/
src/wx/fonts_dialog.h
+++ b/
src/wx/fonts_dialog.h
@@
-1,42
+1,56
@@
/*
/*
- Copyright (C) 2014-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+#include <memory>
+
class Content;
class Content;
+class TextContent;
+namespace dcpomatic {
+ class Font;
+}
+
class FontsDialog : public wxDialog
{
public:
class FontsDialog : public wxDialog
{
public:
- FontsDialog (wxWindow* parent,
boost::shared_ptr<Content>
);
+ FontsDialog (wxWindow* parent,
std::shared_ptr<Content>, std::shared_ptr<TextContent> caption
);
private:
void setup ();
void setup_sensitivity ();
void selection_changed ();
private:
void setup ();
void setup_sensitivity ();
void selection_changed ();
- void edit_clicked ();
+ void set_from_file_clicked ();
+ void set_from_system_font_clicked ();
+ std::shared_ptr<dcpomatic::Font> get_selection ();
- boost::weak_ptr<Content> _content;
+ std::weak_ptr<Content> _content;
+ std::weak_ptr<TextContent> _caption;
wxListCtrl* _fonts;
wxListCtrl* _fonts;
- wxButton* _edit;
+ wxButton* _set_from_file;
+ wxButton* _set_from_system_font = nullptr;
};
};