Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 67d23526d62eab381b6226350f254ecd717e7904..6556f39cd6cc9c0ed9ca78ad0bdc026a60980565 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -15,6 +15,7 @@
 #define _WX_BUFFER_H
 
 #include "wx/wxchar.h"
 #define _WX_BUFFER_H
 
 #include "wx/wxchar.h"

+

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


@@ -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,7 +54,9 @@ 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;


@@ -65,10 +68,14 @@ class wxWCharBuffer
 public:
     wxWCharBuffer(const wchar_t *wcs)
     {
 public:
     wxWCharBuffer(const wchar_t *wcs)
     {

-        wxASSERT_MSG( wcs, _T("NULL string in wxWCharBuffer") );
+        wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );

 
         if (wcs) {
 
         if (wcs) {

-          size_t siz = (wcslen(wcs)+1)*sizeof(wchar_t);
+#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+          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);
         }
           m_wcs = (wchar_t *)malloc(siz);
           memcpy(m_wcs, wcs, siz);
         }


@@ -77,7 +84,7 @@ public:
     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


@@ -97,7 +104,9 @@ public:
      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;


@@ -105,16 +114,16 @@ private:
 #endif
 
 #if wxUSE_UNICODE
 #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
 
 // ----------------------------------------------------------------------------
 // template class for any kind of data