X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/encconv.h?ds=sidebyside diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 9e67c21141..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 @@ -47,7 +47,7 @@ enum // types // ---------------------------------------------------------------------------- -WX_DEFINE_ARRAY(wxFontEncoding, wxFontEncodingArray); +WX_DEFINE_ARRAY_INT(wxFontEncoding, wxFontEncodingArray); //-------------------------------------------------------------------------------- // wxEncodingConverter @@ -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