From 3bd3baaecd4c58fb3bb6108d2acdb7e560189650 Mon Sep 17 00:00:00 2001 From: Tim Stahlhut Date: Wed, 1 Apr 2026 16:56:50 -0400 Subject: [PATCH] Build fixes when wxUSE_INTL=0 --- include/wx/xlocale.h | 2 ++ src/propgrid/props.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h index f556c3ab7f..4bd568c5bd 100644 --- a/include/wx/xlocale.h +++ b/include/wx/xlocale.h @@ -135,6 +135,7 @@ public: // Construct an uninitialized locale wxXLocale() { m_isC = false; } +#if wxUSE_INTL // Construct from a symbolic language constant: unless the language is // wxLANGUAGE_ENGLISH_US (which we assume to be the same as "C" locale) // the object will be invalid @@ -142,6 +143,7 @@ public: { m_isC = lang == wxLANGUAGE_ENGLISH_US; } +#endif // wxUSE_INTL // Construct from the given language string: unless the string is "C" or // "POSIX" the object will be invalid diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 7cdf2623c3..a53daf3086 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -2055,7 +2055,7 @@ bool wxFileProperty::DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) m_dlgTitle.empty() ? _("Choose a file") : m_dlgTitle, m_initialPath.empty() ? path : m_initialPath, file, - m_wildcard.empty() ? wxGetTranslation(wxALL_FILES) : m_wildcard, + m_wildcard.empty() ? wxString(wxGetTranslation(wxALL_FILES)) : m_wildcard, m_dlgStyle, wxDefaultPosition);