projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash in verification due to mismatched wxString::Format placeholder.
[dcpomatic.git]
/
src
/
wx
/
system_font_dialog.h
diff --git
a/src/wx/system_font_dialog.h
b/src/wx/system_font_dialog.h
index 6d5aa0ef9264a7ccfc1932da763a844c2b861117..48a31a839160223d4408da4347a6e3575d55ab8a 100644
(file)
--- a/
src/wx/system_font_dialog.h
+++ b/
src/wx/system_font_dialog.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 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/>.
*/
*/
@@
-21,7
+22,7
@@
* @brief A dialog box to select one of the "system" fonts on Windows.
*
* This is necessary because wxFileDialog on Windows will not display
* @brief A dialog box to select one of the "system" fonts on Windows.
*
* This is necessary because wxFileDialog on Windows will not display
- * the contents of
c:\Windows\Fonts
, so we need a different way to choose
+ * the contents of
`c:\Windows\Fonts`
, so we need a different way to choose
* one of those fonts.
*/
* one of those fonts.
*/
@@
-35,7
+36,7
@@
class wxListCtrl;
class SystemFontDialog : public wxDialog
{
public:
class SystemFontDialog : public wxDialog
{
public:
- SystemFontDialog (wxWindow* parent);
+
explicit
SystemFontDialog (wxWindow* parent);
boost::optional<boost::filesystem::path> get_font () const;
boost::optional<boost::filesystem::path> get_font () const;