diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-08-08 22:13:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-08-08 22:13:04 +0200 |
| commit | 1346760b389b4f388fd9e2ae029cfb3d950734a6 (patch) | |
| tree | 42b90a7ca8a912d90617b569e825c479ecba958b | |
| parent | d6aeaf8dd1b3158689da7b75c7417c1838af9c95 (diff) | |
Use wxNO_UNSAFE_WXSTRING_CONV and fix a bug it reveals.
| -rw-r--r-- | src/wx/metadata_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/wscript | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc index 644c0546b..69dee0c46 100644 --- a/src/wx/metadata_dialog.cc +++ b/src/wx/metadata_dialog.cc @@ -280,7 +280,7 @@ MetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer) sizer->Add (s, 1, wxEXPAND); } - _luminance_unit->Append (wxString::FromUTF8(_("candela per m²"))); + _luminance_unit->Append (_("candela per m²")); _luminance_unit->Append (_("foot lambert")); } diff --git a/src/wx/wscript b/src/wx/wscript index ad343cede..236e99f97 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -218,6 +218,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-DGL_GLEXT_PROTOTYPES', '-DGLX_GLXEXT_PROTOTYPES']) if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES']) + conf.env.append_value('CXXFLAGS', ['-DwxNO_UNSAFE_WXSTRING_CONV']) if conf.options.static_wxwidgets: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses |