Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BIG glitch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-12 22:43:59 +00:00
parent 4300d6cbc3
commit 6b769f3d1f
1 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/common/string.cpp
View File

@@ -35,6 +35,9 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/intl.h" #include "wx/intl.h"
#if wxUSE_THREADS
#include <wx/thread.h>
#endif
#endif #endif
#include <ctype.h> #include <ctype.h>
@@ -291,26 +294,6 @@ wxString::wxString(const wchar_t *pwz)
#endif #endif
// ---------------------------------------------------------------------------
// multibyte<->Unicode conversion
// ---------------------------------------------------------------------------
#if wxUSE_UNICODE
const wxCharBuffer& mb_str(wxMBConv& conv) const
{
size_t nLen = conv.WC2MB((char *) NULL, m_pchData, 0);
wxCharBuffer buf(nLen);
conv.WC2MB(buf, m_pchData, nLen);
}
#else
const wxWCharBuffer& wc_str(wxMBConv& conv) const
{
size_t nLen = conv.MB2WC((wchar_t *) NULL, m_pchData, 0);
wxCharBuffer buf(nLen);
conv.MB2WC(buf, m_pchData, nLen);
}
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// memory allocation // memory allocation
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -1728,8 +1711,6 @@ void wxArrayString::Remove(const wxChar *sz)
// we can only sort one array at a time with the quick-sort based // we can only sort one array at a time with the quick-sort based
// implementation // implementation
#if wxUSE_THREADS #if wxUSE_THREADS
#include <wx/thread.h>
// need a critical section to protect access to gs_compareFunction and // need a critical section to protect access to gs_compareFunction and
// gs_sortAscending variables // gs_sortAscending variables
static wxCriticalSection *gs_critsectStringSort = NULL; static wxCriticalSection *gs_critsectStringSort = NULL;
@@ -1813,12 +1794,12 @@ WXDLLEXPORT_DATA(wxMBConv) wxConv_libc;
// standard libc conversion // standard libc conversion
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
return wxMB2WC(buf, psz, n); return wxMB2WC(buf, psz, n);
} }
size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
return wxWC2MB(buf, psz, n); return wxWC2MB(buf, psz, n);
} }
@@ -1829,19 +1810,21 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n)
class wxMBConv_UTF7 class wxMBConv_UTF7
{ {
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n); public:
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n); virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
} virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7; // WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
WXDLLEXPORT_DATA(wxMBConv) wxConv_UTF7;
// TODO: write actual implementations of UTF-7 here // TODO: write actual implementations of UTF-7 here
size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
return 0; return 0;
} }
size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
return 0; return 0;
} }
@@ -1852,19 +1835,21 @@ size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n)
class wxMBConv_UTF8 class wxMBConv_UTF8
{ {
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n); public:
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n); virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
} virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8; // WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
WXDLLEXPORT_DATA(wxMBConv) wxConv_UTF8;
// TODO: write actual implementations of UTF-8 here // TODO: write actual implementations of UTF-8 here
size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
return wxMB2WC(buf, psz, n); return wxMB2WC(buf, psz, n);
} }
size_t wxMBConv_UTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) size_t wxMBConv_UTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
return wxWC2MB(buf, psz, n); return wxWC2MB(buf, psz, n);
} }
@@ -1879,7 +1864,7 @@ wxCSConv::wxCSConv(const wxChar *charset)
data = (wxChar *) NULL; data = (wxChar *) NULL;
} }
size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
if (buf && !data) { if (buf && !data) {
// latin-1 (direct) // latin-1 (direct)
@@ -1889,7 +1874,7 @@ size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n)
return n; return n;
} }
size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
if (buf && !data) { if (buf && !data) {
// latin-1 (direct) // latin-1 (direct)