From e7194a082f44a4f83edc180b9d7b4da398d5d7d2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Oct 2015 16:51:08 +0200 Subject: [PATCH] Use correct DLL export declaration for wxLanguageInfoArray This class is forward declared with WXDLLIMPEXP_FWD_BASE, so it should be really declated with the matching WXDLLIMPEXP_BASE and not with WXDLLIMPEXP_CORE used by WX_DECLARE_EXPORTED_OBJARRAY() by default too. Somehow the mismatch between forward and real declaration doesn't seem to create any problems, but still fix this for consistency and because it might explain http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/83980 --- src/common/intl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/intl.cpp b/src/common/intl.cpp index fbe672550e..d76628f875 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -176,7 +176,7 @@ wxString wxLanguageInfo::GetLocaleName() const // ---------------------------------------------------------------------------- #include "wx/arrimpl.cpp" -WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray); +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray, WXDLLIMPEXP_BASE); WX_DEFINE_OBJARRAY(wxLanguageInfoArray) wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;