...and my Linux doesn't have wcstr.h. (Including of those files should be
performed in wxchar.h now anyway) Also encapsulated wxWCharBuffer in #if wxUSE_WCHAR_T git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,14 +17,6 @@
|
|||||||
#include "wx/wxchar.h"
|
#include "wx/wxchar.h"
|
||||||
#include <string.h> // strdup
|
#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
|
// Special classes for (wide) character strings: they use malloc/free instead
|
||||||
// of new/delete
|
// of new/delete
|
||||||
@@ -67,6 +59,7 @@ private:
|
|||||||
char *m_str;
|
char *m_str;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if wxUSE_WCHAR_T
|
||||||
class wxWCharBuffer
|
class wxWCharBuffer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -109,6 +102,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
wchar_t *m_wcs;
|
wchar_t *m_wcs;
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
#define wxMB2WXbuf wxWCharBuffer
|
#define wxMB2WXbuf wxWCharBuffer
|
||||||
|
Reference in New Issue
Block a user