]> git.saurik.com Git - wxWidgets.git/commitdiff
wxMsgCatalog destructor should be public.
authorVáclav Slavík <vslavik@fastmail.fm>
Sat, 8 May 2010 15:31:12 +0000 (15:31 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sat, 8 May 2010 15:31:12 +0000 (15:31 +0000)
Fixes #12031.

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

include/wx/translation.h

index abd92a6d27d449cfeea1432b9ac65716b8d44194..344379ec3603b5126fb991ffd85773dd475dda9c 100644 (file)
@@ -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)