From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 8 May 2010 15:31:12 +0000 (+0000)
Subject: wxMsgCatalog destructor should be public.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3a72e0ed15781e53e6b69a1c82c39b08d7a435d4

wxMsgCatalog destructor should be public.

Fixes #12031.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/translation.h b/include/wx/translation.h
index abd92a6d27..344379ec36 100644
--- a/include/wx/translation.h
+++ b/include/wx/translation.h
@@ -61,6 +61,12 @@ wxDECLARE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr)
 class WXDLLIMPEXP_BASE wxMsgCatalog
 {
 public:
+    // Ctor is protected, because CreateFromXXX functions must be used,
+    // but destruction should be unrestricted
+#if !wxUSE_UNICODE
+    ~wxMsgCatalog();
+#endif
+
     // load the catalog from disk or from data; caller is responsible for
     // deleting them if not NULL
     static wxMsgCatalog *CreateFromFile(const wxString& filename,
@@ -82,9 +88,6 @@ protected:
         , m_conv(NULL)
 #endif
     {}
-#if !wxUSE_UNICODE
-    ~wxMsgCatalog();
-#endif
 
 private:
     // variable pointing to the next element in a linked list (or NULL)