added GetIconOfExactSize()

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index a0c2786ef43e086b49f5ffba958005218bcee72a..59a7ad6c35de5e5dd713f2848bfe9a22ede9de02 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -126,9 +126,7 @@ public:
     wxCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {}
     wxCharBuffer(size_t len) : wxCharTypeBufferBase(len) {}
 
-#if !wxUSE_UNICODE
     wxCharBuffer(const wxCStrData& cstr);
-#endif
 };
 
 #if wxUSE_WCHAR_T
@@ -140,15 +138,13 @@ public:
     wxWCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {}
     wxWCharBuffer(size_t len) : wxCharTypeBufferBase(len) {}
 
-#if wxUSE_UNICODE
     wxWCharBuffer(const wxCStrData& cstr);
-#endif
 };
 #endif // wxUSE_WCHAR_T
 
 // wxCharTypeBuffer<T> implicitly convertible to T*
 template <typename T>
-class wxWritableCharTypeBuffer : wxCharTypeBuffer<T>
+class wxWritableCharTypeBuffer : public wxCharTypeBuffer<T>
 {
 public:
     typedef typename wxCharTypeBuffer<T>::CharType CharType;