Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index dea159f83382d6cbbde7767917aafce0836e39c0..afc077699482ea45ad6b246cfda58893dabc9533 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -17,14 +17,6 @@
 #include "wx/wxchar.h"
 #include <string.h> // strdup
 
 #include "wx/wxchar.h"
 #include <string.h> // strdup
 

-#ifdef HAVE_WCSTR_H
-#include <wcstr.h>
-#elif defined( HAVE_WCHAR_H )
-#include <wchar.h>  // wchar_t
-#else
-#pragma error "Don't know what to do!"
-#endif
-

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


@@ -62,11 +54,13 @@ public:
    }
 
    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:
 class wxWCharBuffer
 {
 public:


@@ -105,10 +99,12 @@ public:
    }
 
    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
 #define wxMB2WXbuf wxWCharBuffer
 
 #if wxUSE_UNICODE
 #define wxMB2WXbuf wxWCharBuffer