no changes, just update the copyright in the header

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 148eeb01e00ae9c091a0899df9053d6fbabe0faa..cf538d1491ee437533c452d0f77966fa3ec30589 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -240,7 +240,7 @@ private:
     // the conversion object we forward to
     wxMBConv *m_conv;
 
-    DECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames)
+    wxDECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames);
 };
 
 #endif // __UNIX__
@@ -279,7 +279,7 @@ private:
     // the current decoder state: this is only used by ToWChar() if srcLen
     // parameter is not wxNO_LEN, when working on the entire NUL-terminated
     // strings we neither update nor use the state
-    class DecoderState : StateMode
+    class DecoderState : private StateMode
     {
     private:
         // current state: this one is private as we want to enforce the use of
@@ -311,7 +311,7 @@ private:
 
     // encoder state is simpler as we always receive entire Unicode characters
     // on input
-    class EncoderState : StateMode
+    class EncoderState : private StateMode
     {
     private:
         Mode mode;