X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02c92ad972ebc51001dddfd930e6811ab7901483..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/encconv.h diff --git a/include/wx/encconv.h b/include/wx/encconv.h index a4eecd05ec..6a54439eeb 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -10,14 +10,8 @@ #ifndef _WX_ENCCONV_H_ #define _WX_ENCCONV_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "encconv.h" -#endif - #include "wx/defs.h" -#if wxUSE_FONTMAP - #include "wx/object.h" #include "wx/fontenc.h" #include "wx/dynarray.h" @@ -60,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. @@ -162,6 +156,4 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject DECLARE_NO_COPY_CLASS(wxEncodingConverter) }; -#endif // wxUSE_FONTMAP - #endif // _WX_ENCCONV_H_