X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.h;h=c741131c41c4cd707a7aea7e3e1aa2eab0049dfc;hb=e7245abe84a1a09a5f680e426b5dfac2de2e472a;hp=b62ba381747bfa2bd274295956e64c33dbbc9f60;hpb=b090dda8afed4f73349a5fa1e603a734171aa404;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index b62ba3817..c741131c4 100644 --- a/src/wx/fonts_dialog.h +++ b/src/wx/fonts_dialog.h @@ -19,17 +19,20 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include class Content; class TextContent; +namespace dcpomatic { + class Font; +} class FontsDialog : public wxDialog @@ -41,10 +44,13 @@ 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 get_selection (); std::weak_ptr _content; std::weak_ptr _caption; wxListCtrl* _fonts; - wxButton* _edit; + wxButton* _set_from_file; + wxButton* _set_from_system_font = nullptr; };