X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b412d238281008e248bcdebeae4baf4b67191e7..c5c1ea964817e562d1c4b0d89b3937fce28c3f10:/include/wx/encconv.h diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 7d925b3551..2c4bfa21e2 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -10,10 +10,6 @@ #ifndef _WX_ENCCONV_H_ #define _WX_ENCCONV_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "encconv.h" -#endif - #include "wx/defs.h" #include "wx/object.h" @@ -58,7 +54,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject public: wxEncodingConverter(); - ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } + virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } // Initialize conversion. Both output or input encoding may // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1. @@ -157,7 +153,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject bool m_UnicodeInput, m_UnicodeOutput; bool m_JustCopy; - DECLARE_NO_COPY_CLASS(wxEncodingConverter) + wxDECLARE_NO_COPY_CLASS(wxEncodingConverter); }; #endif // _WX_ENCCONV_H_