Compilation fixes for wxUSE_INTL==0 build.

Closes https://github.com/wxWidgets/wxWidgets/pull/70
This commit is contained in:
Artur Wieczorek
2015-08-10 18:09:04 +02:00
committed by Vadim Zeitlin
parent 941834fd0e
commit c746fee94a
4 changed files with 6 additions and 1 deletions

View File

@@ -76,8 +76,10 @@ public:
// Construct an uninitialized locale
wxXLocale() { m_locale = NULL; }
#if wxUSE_INTL
// Construct from a symbolic language constant
wxXLocale(wxLanguage lang);
#endif
// Construct from the given language string
wxXLocale(const char *loc) { Init(loc); }

View File

@@ -87,6 +87,7 @@ wxXLocale& wxXLocale::GetCLocale()
#ifdef wxHAS_XLOCALE_SUPPORT
#if wxUSE_INTL
wxXLocale::wxXLocale(wxLanguage lang)
{
const wxLanguageInfo * const info = wxLocale::GetLanguageInfo(lang);
@@ -99,6 +100,7 @@ wxXLocale::wxXLocale(wxLanguage lang)
Init(info->GetLocaleName().c_str());
}
}
#endif // wxUSE_INTL
#if wxCHECK_VISUALC_VERSION(8)

View File

@@ -231,7 +231,7 @@ void wxDumpOpenExternalDlg::OnBrowse(wxCommandEvent& )
fname.GetPathWithSep(),
fname.GetFullName()
#ifdef __WXMSW__
, _("Executable files (*.exe)|*.exe|") + wxALL_FILES
, wxString(_("Executable files (*.exe)|*.exe|")) + wxALL_FILES
#endif // __WXMSW__
);
if ( dlg.ShowModal() == wxID_OK )

View File

@@ -27,6 +27,7 @@
#include "wx/msw/private.h"
#include "wx/msw/taskbarbutton.h"
#include "wx/scopedptr.h"
#include <shlwapi.h>
#include <initguid.h>