Window management and sizer layout corrections

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 87b05070225950cae2034eb811e08286d652f89f..c2aaa0c09b727ef7289ece05c2a3d4526bda9aad 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -14,8 +14,9 @@
 #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


@@ -27,14 +28,14 @@ class wxCharBuffer
 public:
     wxCharBuffer(const char *str)
     {
 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;
     }
     wxCharBuffer(size_t len)
     {
         m_str = (char *)malloc(len+1);
 
         m_str = str ? strdup(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); }
     }
     // no need to check for NULL, free() does it
    ~wxCharBuffer() { free(m_str); }


@@ -53,27 +54,38 @@ public:
      return *this;
    }
 
      return *this;
    }
 

+   const char *data() const { return m_str; }

    operator const char *() const { return m_str; }
    operator const char *() const { return m_str; }

+   char operator[](size_t n) const { return m_str[n]; }

 
 private:
    char *m_str;
 };
 
 
 private:
    char *m_str;
 };
 

+#if wxUSE_WCHAR_T

 class wxWCharBuffer
 {
 public:
     wxWCharBuffer(const wchar_t *wcs)
     {
 class wxWCharBuffer
 {
 public:
     wxWCharBuffer(const wchar_t *wcs)
     {

-        wxASSERT_MSG( wcs, _T("NULL string in wxWCharBuffer") );
+        wxASSERT_MSG( wcs, wxT("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) {
+#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);
+        }
+        else m_wcs = (wchar_t *)NULL;

     }
     wxWCharBuffer(size_t len)
     {
         m_wcs = (wchar_t *)malloc((len+1)*sizeof(wchar_t));
     }
     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
     }
 
     // no need to check for NULL, free() does it


@@ -83,33 +95,36 @@ 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;
    }
 

+   const wchar_t *data() const { return m_wcs; }

    operator const wchar_t *() 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;
 };
 
 private:
    wchar_t *m_wcs;
 };

+#endif

 
 #if wxUSE_UNICODE
 
 #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
 
 // ----------------------------------------------------------------------------
 // template class for any kind of data