X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a1cad6ea487130bc074d858368cd93241ae2cf2..b6d5d4548c2c8b984314650dcb96522fedc51d86:/include/wx/encconv.h diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 84d2677175..71b4812e79 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -10,7 +10,7 @@ #ifndef _WX_ENCCONV_H_ #define _WX_ENCCONV_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "encconv.h" #endif @@ -62,7 +62,7 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject wxEncodingConverter(); ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } - // Initialize convertion. Both output or input encoding may + // Initialize conversion. Both output or input encoding may // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1. // // All subsequent calls to Convert() will interpret it's argument @@ -148,6 +148,7 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject bool m_UnicodeInput, m_UnicodeOutput; bool m_JustCopy; + DECLARE_NO_COPY_CLASS(wxEncodingConverter) }; #endif // wxUSE_FONTMAP