projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore use of SystemFontDialog so that system fonts can be selected on Windows ...
[dcpomatic.git]
/
src
/
wx
/
fonts_dialog.h
diff --git
a/src/wx/fonts_dialog.h
b/src/wx/fonts_dialog.h
index 612971031bebe7473ea9a196a7e7a105792512f1..c741131c41c4cd707a7aea7e3e1aa2eab0049dfc 100644
(file)
--- a/
src/wx/fonts_dialog.h
+++ b/
src/wx/fonts_dialog.h
@@
-30,6
+30,9
@@
LIBDCP_ENABLE_WARNINGS
class Content;
class TextContent;
class Content;
class TextContent;
+namespace dcpomatic {
+ class Font;
+}
class FontsDialog : public wxDialog
class FontsDialog : public wxDialog
@@
-41,10
+44,13
@@
private:
void setup ();
void setup_sensitivity ();
void selection_changed ();
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 ();
std::weak_ptr<Content> _content;
std::weak_ptr<TextContent> _caption;
wxListCtrl* _fonts;
std::weak_ptr<Content> _content;
std::weak_ptr<TextContent> _caption;
wxListCtrl* _fonts;
- wxButton* _edit;
+ wxButton* _set_from_file;
+ wxButton* _set_from_system_font = nullptr;
};
};