SOCKLEN_T expanded to socklen_t if supported, neede by ALPHA (yes, it's back!)

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 87b05070225950cae2034eb811e08286d652f89f..a1547764c71c1f3264ad9782ba97f990fcab09ad 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -14,8 +14,8 @@
 #ifndef _WX_BUFFER_H
 #define _WX_BUFFER_H
 
 #ifndef _WX_BUFFER_H
 #define _WX_BUFFER_H
 

+#include "wx/wxchar.h"

 #include <string.h> // strdup
 #include <string.h> // strdup

-#include <wchar.h>  // wchar_t

 
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead
 
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead


@@ -66,9 +66,12 @@ public:
     {
         wxASSERT_MSG( wcs, _T("NULL string in wxWCharBuffer") );
 
     {
         wxASSERT_MSG( wcs, _T("NULL string in wxWCharBuffer") );
 

-        m_wcs = wcs ? (wchar_t *)malloc((wcslen(wcs)+1)*sizeof(wchar_t))
-                   : (wchar_t *)NULL;
-       if (m_wcs) wcscpy(m_wcs, wcs);
+        if (wcs) {
+          size_t siz = (wcslen(wcs)+1)*sizeof(wchar_t);
+          m_wcs = (wchar_t *)malloc(siz);
+          memcpy(m_wcs, wcs, siz);
+        }
+        else m_wcs = (wchar_t *)NULL;

     }
     wxWCharBuffer(size_t len)
     {
     }
     wxWCharBuffer(size_t len)
     {


@@ -83,13 +86,13 @@ public:
    {
      m_wcs = src.m_wcs;
      // no reference count yet...
    {
      m_wcs = src.m_wcs;
      // no reference count yet...

-     (wxWCharBuffer)src.m_wcs = (wchar_t *)NULL;
+     ((wxWCharBuffer*)&src)->m_wcs = (wchar_t *)NULL;

    }
    wxWCharBuffer& operator=(const wxWCharBuffer& src)
    {
      m_wcs = src.m_wcs;
      // no reference count yet...
    }
    wxWCharBuffer& operator=(const wxWCharBuffer& src)
    {
      m_wcs = src.m_wcs;
      // no reference count yet...

-     (wxWCharBuffer)src.m_wcs = (wchar_t *)NULL;
+     ((wxWCharBuffer*)&src)->m_wcs = (wchar_t *)NULL;

      return *this;
    }
 
      return *this;
    }