Use wxNO_UNSAFE_WXSTRING_CONV and fix a bug it reveals.

diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc
index 644c0546b0de6681dab0d4ea1ec7c6461216062b..69dee0c4612d428864b9f6e0ea84c7f301f7d42e 100644 (file)
--- 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 ad343cede428ca338ddc887d95f1aaca24e07e29..236e99f975f091f5befe60123222c4ff9317740c 100644 (file)
--- 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