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

Changed capitalization style of wxConv*

Browse Source 
(e.g. wxConv_current is now wxConvCurrent, although I put some #defines
in to still have it compile)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-26 18:18:30 +00:00
parent a737331db6
commit 5f709e6725
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/wx/string.h
View File

@@ -206,7 +206,8 @@ class WXDLLEXPORT wxMBConv
const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); } const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
#endif #endif
}; };
WXDLLEXPORT_DATA(extern wxMBConv) wxConv_libc; WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
#define wxConv_libc wxConvLibc
#define wxANOTHER_MBCONV(type) \ #define wxANOTHER_MBCONV(type) \
class type : public wxMBConv { \ class type : public wxMBConv { \
@@ -215,11 +216,14 @@ class type : public wxMBConv { \
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const; \ virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const; \
} }
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_file)) wxConv_file; WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvFile)) wxConvFile;
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_UTF7)) wxConv_UTF7; #define wxConv_file wxConvFile
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_UTF8)) wxConv_UTF8; WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvUTF7)) wxConvUTF7;
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvUTF8)) wxConvUTF8;
#define wxConv_UTF8 wxConvUTF8
#if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0) #if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_gdk)) wxConv_gdk; WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvGdk)) wxConvGdk;
#define wxConv_gdk wxConvGdk
#endif // GTK > 1.0 #endif // GTK > 1.0
class wxCharacterSet; class wxCharacterSet;
@@ -238,9 +242,11 @@ class WXDLLEXPORT wxCSConv : public wxMBConv
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const; virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
}; };
WXDLLEXPORT_DATA(extern wxCSConv) wxConv_local; WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
#define wxConv_local wxConvLocal
WXDLLEXPORT_DATA(extern wxMBConv *) wxConv_current; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
#define wxConv_current wxConvCurrent
// filenames are multibyte on Unix and probably widechar on Windows? // filenames are multibyte on Unix and probably widechar on Windows?
#if defined(__UNIX__) || defined(__BORLANDC__) #if defined(__UNIX__) || defined(__BORLANDC__)
@@ -250,7 +256,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConv_current;
#endif #endif
#if wxMBFILES #if wxMBFILES
#define wxFNCONV(name) wxConv_file.cWX2MB(name) #define wxFNCONV(name) wxConvFile.cWX2MB(name)
#define FNSTRINGCAST MBSTRINGCAST #define FNSTRINGCAST MBSTRINGCAST
#else #else
#define wxFNCONV(name) name #define wxFNCONV(name) name
@@ -258,7 +264,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConv_current;
#endif #endif
#else//!wxUSE_WCHAR_T #else//!wxUSE_WCHAR_T
class WXDLLEXPORT wxMBConv {}; class WXDLLEXPORT wxMBConv {};
WXDLLEXPORT_DATA(extern wxMBConv) wxConv_libc; WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
#endif//wxUSE_WCHAR_T #endif//wxUSE_WCHAR_T
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -365,7 +371,7 @@ public:
// from multibyte string // from multibyte string
// (NB: nLength is right now number of Unicode characters, not // (NB: nLength is right now number of Unicode characters, not
// characters in psz! So try not to use it yet!) // characters in psz! So try not to use it yet!)
wxString(const char *psz, wxMBConv& conv = wxConv_libc, size_t nLength = wxSTRING_MAXLEN); wxString(const char *psz, wxMBConv& conv = wxConvLibc, size_t nLength = wxSTRING_MAXLEN);
// from wxWCharBuffer (i.e. return from wxGetString) // from wxWCharBuffer (i.e. return from wxGetString)
wxString(const wxWCharBuffer& psz) wxString(const wxWCharBuffer& psz)
{ InitWith(psz, 0, wxSTRING_MAXLEN); } { InitWith(psz, 0, wxSTRING_MAXLEN); }
@@ -464,22 +470,22 @@ public:
// //
const wxChar* GetData() const { return m_pchData; } const wxChar* GetData() const { return m_pchData; }
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxCharBuffer mb_str(wxMBConv& conv = wxConv_libc) const { return conv.cWC2MB(m_pchData); } const wxCharBuffer mb_str(wxMBConv& conv = wxConvLibc) const { return conv.cWC2MB(m_pchData); }
const wxChar* wc_str(wxMBConv& WXUNUSED(conv) = wxConv_libc) const { return m_pchData; } const wxChar* wc_str(wxMBConv& WXUNUSED(conv) = wxConvLibc) const { return m_pchData; }
#if wxMBFILES #if wxMBFILES
const wxCharBuffer fn_str() const { return mb_str(wxConv_file); } const wxCharBuffer fn_str() const { return mb_str(wxConvFile); }
#else #else
const wxChar* fn_str() const { return m_pchData; } const wxChar* fn_str() const { return m_pchData; }
#endif #endif
#else #else
const wxChar* mb_str(wxMBConv& WXUNUSED(conv) = wxConv_libc ) const { return m_pchData; } const wxChar* mb_str(wxMBConv& WXUNUSED(conv) = wxConvLibc ) const { return m_pchData; }
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
const wxWCharBuffer wc_str(wxMBConv& conv) const { return conv.cMB2WC(m_pchData); } const wxWCharBuffer wc_str(wxMBConv& conv) const { return conv.cMB2WC(m_pchData); }
#endif #endif
const wxChar* fn_str() const { return m_pchData; } const wxChar* fn_str() const { return m_pchData; }
#endif #endif
// for convenience // for convenience
const wxWX2MBbuf mbc_str() const { return mb_str(*wxConv_current); } const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); }
// overloaded assignment // overloaded assignment
// from another wxString // from another wxString

34
src/common/string.cpp
View File

@@ -1824,15 +1824,15 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// standard file conversion // standard file conversion
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConv_file) wxConv_file; WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile;
// just use the libc conversion for now // just use the libc conversion for now
size_t wxMBConv_file::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvFile::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
return wxMB2WC(buf, psz, n); return wxMB2WC(buf, psz, n);
} }
size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
return wxWC2MB(buf, psz, n); return wxWC2MB(buf, psz, n);
} }
@@ -1842,11 +1842,11 @@ size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0) #if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)
WXDLLEXPORT_DATA(wxMBConv_gdk) wxConv_gdk; WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
#include <gdk/gdk.h> #include <gdk/gdk.h>
size_t wxMBConv_gdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
if (buf) { if (buf) {
return gdk_mbstowcs((GdkWChar *)buf, psz, n); return gdk_mbstowcs((GdkWChar *)buf, psz, n);
@@ -1858,7 +1858,7 @@ size_t wxMBConv_gdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
} }
} }
size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
char *mbstr = gdk_wcstombs((GdkWChar *)psz); char *mbstr = gdk_wcstombs((GdkWChar *)psz);
size_t len = mbstr ? strlen(mbstr) : 0; size_t len = mbstr ? strlen(mbstr) : 0;
@@ -1875,7 +1875,7 @@ size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// UTF-7 // UTF-7
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7; WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;
#if 0 #if 0
static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ" static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -1888,12 +1888,12 @@ static char utf7_setB[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#endif #endif
// 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) const size_t wxMBConvUTF7::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) const size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
return 0; return 0;
} }
@@ -1902,11 +1902,11 @@ size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// UTF-8 // UTF-8
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8; WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
static unsigned long utf8_max[]={0x7f,0x7ff,0xffff,0x1fffff,0x3ffffff,0x7fffffff,0xffffffff}; static unsigned long utf8_max[]={0x7f,0x7ff,0xffff,0x1fffff,0x3ffffff,0x7fffffff,0xffffffff};
size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len = 0; size_t len = 0;
@@ -1947,7 +1947,7 @@ size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
return len; return len;
} }
size_t wxMBConv_UTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len = 0; size_t len = 0;
@@ -2026,12 +2026,8 @@ static void wxLoadCharacterSets(void)
wxStringTokenizer token(line); wxStringTokenizer token(line);
wxString cmd = token.GetNextToken(); wxString cmd = token.GetNextToken();
if (cmd == comchar) { if (cmd == comchar) {
if (token.GetNextToken() == _T("alias")) { if (token.GetNextToken() == _T("alias"))
wxStringTokenizer names(token.GetNextToken(),_T("/")); cset->names.Add(token.GetNextToken());
wxString name;
while (!(name = names.GetNextToken()).IsEmpty())
cset->names.Add(name);
}
} }
else if (cmd == _T("<code_set_name>")) else if (cmd == _T("<code_set_name>"))
cset->names.Add(token.GetNextToken()); cset->names.Add(token.GetNextToken());
@@ -2095,7 +2091,7 @@ static wxCharacterSet *wxFindCharacterSet(const wxChar *charset)
return (wxCharacterSet *)NULL; return (wxCharacterSet *)NULL;
} }
WXDLLEXPORT_DATA(wxCSConv) wxConv_local((const wxChar *)NULL); WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
wxCSConv::wxCSConv(const wxChar *charset) wxCSConv::wxCSConv(const wxChar *charset)
{ {