Upported combobox changes and another fix.

[wxWidgets.git] / include / wx / encconv.h

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 013b9d76bfb31c4bc10136eb4c34fca62b4f5228..71b4812e7901c4424151bd31cce2fe8b49380fc8 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -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