Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index d64ed386e61666750e5f1841ccae6d09bb519930..c2aaa0c09b727ef7289ece05c2a3d4526bda9aad 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,8 @@ public:
         wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
 
         if (wcs) {
         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);
           size_t siz = (std::wcslen(wcs)+1)*sizeof(wchar_t);
 #else
           size_t siz = (::wcslen(wcs)+1)*sizeof(wchar_t);


@@ -103,6 +105,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]; }