diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-09 16:18:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-09 16:18:00 +0100 |
| commit | 2a01820de9229fd778787421ec4f7bbf1e4b8bf1 (patch) | |
| tree | 9243a62fb21cea583f6b012fcc0ec1088ae19c84 /src/wx | |
| parent | ea3e9db20ede512d5e5d73b41c4cb796eeef56d3 (diff) | |
Hide Font members behind accessors.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/fonts_dialog.cc | 10 | ||||
| -rw-r--r-- | src/wx/hints_dialog.cc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index 22078dafd..aa9fd1540 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -93,9 +93,9 @@ FontsDialog::setup () wxListItem item; item.SetId (n); _fonts->InsertItem (item); - _fonts->SetItem (n, 0, std_to_wx ((*i)->id)); - if ((*i)->file) { - _fonts->SetItem (n, 1, (*i)->file.get().leaf().string ()); + _fonts->SetItem (n, 0, std_to_wx ((*i)->id ())); + if ((*i)->file ()) { + _fonts->SetItem (n, 1, (*i)->file().get().leaf().string ()); } ++n; } @@ -129,8 +129,8 @@ FontsDialog::set_file_clicked () list<shared_ptr<Font> > fonts = content->fonts (); for (list<shared_ptr<Font> >::iterator i = fonts.begin(); i != fonts.end(); ++i) { - if ((*i)->id == id) { - (*i)->file = wx_to_std (d->GetPath ()); + if ((*i)->id() == id) { + (*i)->set_file (wx_to_std (d->GetPath ())); } } diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 83b4ece84..d27597143 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -79,7 +79,7 @@ HintsDialog::film_changed () shared_ptr<SubtitleContent> s = dynamic_pointer_cast<SubtitleContent> (i); if (s) { BOOST_FOREACH (shared_ptr<Font> j, s->fonts ()) { - if (j->file && boost::filesystem::file_size (j->file.get ()) >= (640 * 1024)) { + if (j->file() && boost::filesystem::file_size (j->file().get ()) >= (640 * 1024)) { big_font_files = true; } } |