don't define operator<<(ostream&, wxString) at all if it's already defined in the...

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 8e7fd8dbb16e146f810ca11745d6831b0c3c09ad..a18b85c7626ebe4c39b3deab96db8d6e7ffd8b30 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>             // malloc() and free()
 
-class WXDLLIMPEXP_BASE wxCStrData;
+class WXDLLIMPEXP_FWD_BASE wxCStrData;
 
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_BASE wxCStrData;
 // ----------------------------------------------------------------------------
 
 template <typename T>
-class wxCharTypeBuffer
+class WXDLLIMPEXP_BASE wxCharTypeBuffer
 {
 public:
     typedef T CharType;
@@ -150,7 +150,9 @@ private:
     bool m_owned;
 };
 
-class wxCharBuffer : public wxCharTypeBuffer<char>
+WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<char> )
+
+class WXDLLIMPEXP_BASE wxCharBuffer : public wxCharTypeBuffer<char>
 {
 public:
     typedef wxCharTypeBuffer<char> wxCharTypeBufferBase;
@@ -165,7 +167,9 @@ public:
 };
 
 #if wxUSE_WCHAR_T
-class wxWCharBuffer : public wxCharTypeBuffer<wchar_t>
+WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
+
+class WXDLLIMPEXP_BASE wxWCharBuffer : public wxCharTypeBuffer<wchar_t>
 {
 public:
     typedef wxCharTypeBuffer<wchar_t> wxCharTypeBufferBase;
@@ -284,7 +288,7 @@ private:
 };
 
 
-class wxMemoryBuffer
+class WXDLLIMPEXP_BASE wxMemoryBuffer
 {
 public:
     // ctor and dtor