wxMsgCatalog destructor should be public.
Fixes #12031. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,6 +61,12 @@ wxDECLARE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr)
|
|||||||
class WXDLLIMPEXP_BASE wxMsgCatalog
|
class WXDLLIMPEXP_BASE wxMsgCatalog
|
||||||
{
|
{
|
||||||
public:
|
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
|
// load the catalog from disk or from data; caller is responsible for
|
||||||
// deleting them if not NULL
|
// deleting them if not NULL
|
||||||
static wxMsgCatalog *CreateFromFile(const wxString& filename,
|
static wxMsgCatalog *CreateFromFile(const wxString& filename,
|
||||||
@@ -82,9 +88,6 @@ protected:
|
|||||||
, m_conv(NULL)
|
, m_conv(NULL)
|
||||||
#endif
|
#endif
|
||||||
{}
|
{}
|
||||||
#if !wxUSE_UNICODE
|
|
||||||
~wxMsgCatalog();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// variable pointing to the next element in a linked list (or NULL)
|
// variable pointing to the next element in a linked list (or NULL)
|
||||||
|
Reference in New Issue
Block a user