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

first pass of wxUniv merge - nothing works, most parts don't even compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/strconv.cpp
View File

@@ -627,7 +627,7 @@ public:
{
size_t len =
MultiByteToWideChar(CodePage, 0, psz, -1, buf, buf ? n : 0);
//VS: returns # of written chars for buf!=NULL and *size*
//VS: returns # of written chars for buf!=NULL and *size*
// needed buffer for buf==NULL
return len ? (buf ? len : len-1) : (size_t)-1;
}
@@ -636,7 +636,7 @@ public:
{
size_t len = WideCharToMultiByte(CodePage, 0, psz, -1, buf,
buf ? n : 0, NULL, NULL);
//VS: returns # of written chars for buf!=NULL and *size*
//VS: returns # of written chars for buf!=NULL and *size*
// needed buffer for buf==NULL
return len ? (buf ? len : len-1) : (size_t)-1;
}
@@ -647,7 +647,9 @@ public:
public:
long CodePage;
};
#endif
#endif // __WIN32__
#if wxUSE_FONTMAP
class EC_CharSet : public wxCharacterSet
{
@@ -692,6 +694,8 @@ public:
wxEncodingConverter m2w, w2m;
};
#endif // wxUSE_FONTMAP
static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
{
wxCharacterSet *cset = NULL;
@@ -709,7 +713,9 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
}
}
if (cset && cset->usable()) return cset;
if (cset && cset->usable())
return cset;
if (cset)
{
delete cset;
@@ -724,9 +730,11 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
delete cset;
#endif // __WIN32__
#if wxUSE_FONTMAP
cset = new EC_CharSet(name);
if (cset->usable())
return cset;
#endif // wxUSE_FONTMAP
delete cset;
wxLogError(_("Unknown encoding '%s'!"), name);
@@ -854,10 +862,10 @@ public:
class EC_CharSetConverter
{
public:
EC_CharSetConverter(EC_CharSet*from,EC_CharSet*to)
EC_CharSetConverter(EC_CharSet* from,EC_CharSet* to)
{ cnv.Init(from->enc,to->enc); }
size_t Convert(char*buf, const char*psz, size_t n)
size_t Convert(char* buf, const char* psz, size_t n)
{
size_t inbuf = strlen(psz);
if (buf) cnv.Convert(psz,buf);