switching to defines not having a value for __WXMAC__

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 59aefd6a5c3de1d9b489a2967776c36a358b7b41..a28fe448eb554fff9686cc3128a4b414c1232172 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -41,11 +41,18 @@ class WXDLLIMPEXP_BASE wxMBConv
 public:
     // the actual conversion takes place here
     //
 public:
     // the actual conversion takes place here
     //

-    // note that n is the size of the output buffer, not the length of input
+    // note that outputSize is the size of the output buffer, not the length of input

     // (the latter is always supposed to be NUL-terminated)
     virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const = 0;
     virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const = 0;
 
     // (the latter is always supposed to be NUL-terminated)
     virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const = 0;
     virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const = 0;
 

+    // actual conversion for strings with embedded null characters
+    //
+    // outputSize is the size of the output buffer
+    // pszLen is the length of the input string (including all but last null character)
+    size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize, size_t pszLen) const;
+    size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize, size_t pszLen) const;
+

     // MB <-> WC
     const wxWCharBuffer cMB2WC(const char *psz) const;
     const wxCharBuffer cWC2MB(const wchar_t *psz) const;
     // MB <-> WC
     const wxWCharBuffer cMB2WC(const char *psz) const;
     const wxCharBuffer cWC2MB(const wchar_t *psz) const;