Refactor wxDocParentFrame and wxDocMDIParentFrame to share common base class.

[wxWidgets.git] / include / wx / translation.h

diff --git a/include/wx/translation.h b/include/wx/translation.h
index abd92a6d27d449cfeea1432b9ac65716b8d44194..344379ec3603b5126fb991ffd85773dd475dda9c 100644 (file)
--- a/include/wx/translation.h
+++ b/include/wx/translation.h
@@ -61,6 +61,12 @@ wxDECLARE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr)
 class WXDLLIMPEXP_BASE wxMsgCatalog
 {
 public:
 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,
     // 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
     {}
         , m_conv(NULL)
 #endif
     {}

-#if !wxUSE_UNICODE
-    ~wxMsgCatalog();
-#endif

 
 private:
     // variable pointing to the next element in a linked list (or NULL)
 
 private:
     // variable pointing to the next element in a linked list (or NULL)