Removing wxPlotWindow.

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index b91a6cfc7831e6ca7c5e4b2f8bb2c17bec9d75ef..6556f39cd6cc9c0ed9ca78ad0bdc026a60980565 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -54,6 +54,7 @@ public:
      return *this;
    }
 
      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]; }
 
    operator const char *() const { return m_str; }
    char operator[](size_t n) const { return m_str[n]; }
 


@@ -70,7 +71,11 @@ public:
         wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
 
         if (wcs) {
         wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
 
         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);
         }


@@ -99,6 +104,7 @@ public:
      return *this;
    }
 
      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]; }
 
    operator const wchar_t *() const { return m_wcs; }
    wchar_t operator[](size_t n) const { return m_wcs[n]; }