X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1fa8b4e258d8acb886efd5b2f0460dff52d9386..84dd58ce98d52362fabd7f83b1213cce95c5f87a:/include/wx/buffer.h?ds=sidebyside

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index afc0776994..e4a43eccae 100644
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -15,6 +15,7 @@
 #define _WX_BUFFER_H
 
 #include "wx/wxchar.h"
+
 #include <string.h> // strdup
 
 // ----------------------------------------------------------------------------
@@ -27,14 +28,14 @@ class wxCharBuffer
 public:
     wxCharBuffer(const char *str)
     {
-        wxASSERT_MSG( str, _T("NULL string in wxCharBuffer") );
+        wxASSERT_MSG( str, wxT("NULL string in wxCharBuffer") );
 
-        m_str = str ? strdup(str) : (char *)NULL;
+        m_str = str ? wxStrdup(str) : (char *)NULL;
     }
     wxCharBuffer(size_t len)
     {
         m_str = (char *)malloc(len+1);
-	m_str[len] = '\0';
+        m_str[len] = '\0';
     }
     // no need to check for NULL, free() does it
    ~wxCharBuffer() { free(m_str); }
@@ -53,6 +54,7 @@ public:
      return *this;
    }
 
+   const char *data() const { return m_str; }
    operator const char *() const { return m_str; }
    char operator[](size_t n) const { return m_str[n]; }
 
@@ -66,10 +68,15 @@ class wxWCharBuffer
 public:
     wxWCharBuffer(const wchar_t *wcs)
     {
-        wxASSERT_MSG( wcs, _T("NULL string in wxWCharBuffer") );
+        wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
 
         if (wcs) {
-          size_t siz = (wcslen(wcs)+1)*sizeof(wchar_t);
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+          size_t siz = (std::wcslen(wcs)+1)*sizeof(wchar_t);
+#else
+          size_t siz = (::wcslen(wcs)+1)*sizeof(wchar_t);
+#endif
           m_wcs = (wchar_t *)malloc(siz);
           memcpy(m_wcs, wcs, siz);
         }
@@ -78,7 +85,7 @@ public:
     wxWCharBuffer(size_t len)
     {
         m_wcs = (wchar_t *)malloc((len+1)*sizeof(wchar_t));
-	m_wcs[len] = L'\0';
+        m_wcs[len] = L'\0';
     }
 
     // no need to check for NULL, free() does it
@@ -98,25 +105,26 @@ public:
      return *this;
    }
 
+   const wchar_t *data() const { return m_wcs; }
    operator const wchar_t *() const { return m_wcs; }
    wchar_t operator[](size_t n) const { return m_wcs[n]; }
-          
+
 private:
    wchar_t *m_wcs;
 };
 #endif
 
 #if wxUSE_UNICODE
-#define wxMB2WXbuf wxWCharBuffer
-#define wxWX2MBbuf wxCharBuffer
-#define wxWC2WXbuf wxChar*
-#define wxWX2WCbuf wxChar*
-#else
-#define wxMB2WXbuf wxChar*
-#define wxWX2MBbuf wxChar*
-#define wxWC2WXbuf wxCharBuffer
-#define wxWX2WCbuf wxWCharBuffer
-#endif
+    #define wxMB2WXbuf wxWCharBuffer
+    #define wxWX2MBbuf wxCharBuffer
+    #define wxWC2WXbuf wxChar*
+    #define wxWX2WCbuf wxChar*
+#else // ANSI
+    #define wxMB2WXbuf wxChar*
+    #define wxWX2MBbuf wxChar*
+    #define wxWC2WXbuf wxCharBuffer
+    #define wxWX2WCbuf wxWCharBuffer
+#endif // Unicode/ANSI
 
 // ----------------------------------------------------------------------------
 // template class for any kind of data