X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52de37c78f31bc03f8b96090932c7ce8c3907d29..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/buffer.h diff --git a/include/wx/buffer.h b/include/wx/buffer.h index ab41f551db..81a445afe5 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -17,7 +17,7 @@ #include // 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 -class wxCharTypeBuffer +class WXDLLIMPEXP_BASE wxCharTypeBuffer { public: typedef T CharType; @@ -150,6 +150,8 @@ private: bool m_owned; }; +WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) + class WXDLLIMPEXP_BASE wxCharBuffer : public wxCharTypeBuffer { public: @@ -165,6 +167,8 @@ public: }; #if wxUSE_WCHAR_T +WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) + class WXDLLIMPEXP_BASE wxWCharBuffer : public wxCharTypeBuffer { public: @@ -222,6 +226,13 @@ typedef wxWritableCharTypeBuffer wxWritableWCharBuffer; #define wxWX2WCbuf wxWCharBuffer #endif // Unicode/ANSI +// type of the value returned by wxString::utf8_str() +#if wxUSE_UNICODE_UTF8 + #define wxUTF8Buf char * +#else + #define wxUTF8Buf wxCharBuffer +#endif + // ---------------------------------------------------------------------------- // A class for holding growable data buffers (not necessarily strings) // ---------------------------------------------------------------------------- @@ -284,7 +295,7 @@ private: }; -class wxMemoryBuffer +class WXDLLIMPEXP_BASE wxMemoryBuffer { public: // ctor and dtor