X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a08a37d0d69c6b6b35857527ee794ba58911015a..6d8978f030996c834fcd29d85d95ebe261b8defc:/include/wx/strconv.h?ds=inline diff --git a/include/wx/strconv.h b/include/wx/strconv.h index e9d68a51a3..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; @@ -631,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