From c746fee94a8d3e89b90f275d74cbb3500f5445d5 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 10 Aug 2015 18:09:04 +0200
Subject: [PATCH] Compilation fixes for wxUSE_INTL==0 build.

Closes https://github.com/wxWidgets/wxWidgets/pull/70
---
 include/wx/xlocale.h      | 2 ++
 src/common/xlocale.cpp    | 2 ++
 src/generic/dbgrptg.cpp   | 2 +-
 src/msw/taskbarbutton.cpp | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 3fa5f8720d..92cffd5d67 100644
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -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); }
diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index ae58f3de56..02c9d2ca2d 100644
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -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)
 
diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index 7651c00700..a39280a1e8 100644
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -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 )
diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp
index 4fbba3b8ea..f2e04aefd0 100644
--- a/src/msw/taskbarbutton.cpp
+++ b/src/msw/taskbarbutton.cpp
@@ -27,6 +27,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/msw/taskbarbutton.h"
+#include "wx/scopedptr.h"
 
 #include <shlwapi.h>
 #include <initguid.h>