X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6a02087565a52d5c2a2ef7652d56a6a06bfa304..fe79f76ba9aa2f89165481d7ed796f69df979875:/include/wx/strconv.h

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 7f5ee6c2a5..74e871324b 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -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;
@@ -513,7 +513,7 @@ public:
 
     void Clear();
 
-    // return true if the conversion could be initilized successfully
+    // return true if the conversion could be initialized successfully
     bool IsOk() const;
 
 private:
@@ -527,13 +527,19 @@ private:
     wxMBConv *DoCreate() const;
 
     // set the name (may be only called when m_name == NULL), makes copy of
-    // charset string
+    // the charset string
     void SetName(const char *charset);
 
 
+    // m_name may be NULL in which case m_encoding should be used
+    //
     // note that we can't use wxString here because of compilation
     // dependencies: we're included from wx/string.h
     char *m_name;
+
+    // may be wxFONTENCODING_SYSTEM in which case m_name is used
+    //
+    // if m_name is NULL, then we should use the default system encoding
     wxFontEncoding m_encoding;
 
     // use CreateConvIfNeeded() before accessing m_convReal!
@@ -625,7 +631,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
     #define wxFNCONV(name) wxConvFileName->cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else
-#if defined( __WXOSX__ ) && wxMBFILES
+#if defined( __WXOSX_OR_COCOA__ ) && wxMBFILES
     #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
 #else
     #define wxFNCONV(name) name