Added wchar handling for EMX (gcc on OS/2).

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 6556f39cd6cc9c0ed9ca78ad0bdc026a60980565..e4a43eccae38c544b833fc9f7d4d24c53af39fb4 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -30,7 +30,7 @@ public:
     {
         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)
     {
@@ -71,7 +71,8 @@ public:
         wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
 
         if (wcs) {
-#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+#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);