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

More Unicode compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-07-19 08:20:03 +00:00
parent 888b0f22a9
commit 66b3ec7f9a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/filefn.cpp
View File

@@ -1057,7 +1057,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
bool wxRemoveFile(const wxString& file) bool wxRemoveFile(const wxString& file)
{ {
#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
int flag = wxRemove(wxFNSTRINGCAST file.fn_str()); int flag = wxRemove(file);
#elif defined( __WXMAC__ ) #elif defined( __WXMAC__ )
int flag = unlink(wxUnix2MacFilename( file )); int flag = unlink(wxUnix2MacFilename( file ));
#else #else

4
src/common/valgen.cpp
View File

@@ -266,7 +266,7 @@ bool wxGenericValidator::TransferToWindow(void)
else if (m_pInt) else if (m_pInt)
{ {
wxString str; wxString str;
str.Printf("%d", *m_pInt); str.Printf(wxT("%d"), *m_pInt);
pControl->SetValue(str); pControl->SetValue(str);
return TRUE; return TRUE;
} }
@@ -483,7 +483,7 @@ bool wxGenericValidator::TransferFromWindow(void)
} }
else if (m_pInt) else if (m_pInt)
{ {
*m_pInt = atoi(pControl->GetValue()); *m_pInt = wxAtoi(pControl->GetValue());
return TRUE; return TRUE;
} }
} else } else

8
src/common/wxchar.cpp
View File

@@ -97,13 +97,13 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
bool WXDLLEXPORT wxOKlibc() bool WXDLLEXPORT wxOKlibc()
{ {
#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) #if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__)
// GNU libc uses UTF-8 even when it shouldn't // glibc 2.0 uses UTF-8 even when it shouldn't
wchar_t res; wchar_t res = 0;
if ((MB_CUR_MAX == 2) && if ((MB_CUR_MAX == 2) &&
(wxMB2WC(&res, "\xdd\xa5", 1)>0) && (wxMB2WC(&res, "\xdd\xa5", 1) == 1) &&
(res==0x765)) { (res==0x765)) {
// this is UTF-8 allright, check whether that's what we want // this is UTF-8 allright, check whether that's what we want
char *cur_locale = setlocale(LC_ALL, NULL); char *cur_locale = setlocale(LC_CTYPE, NULL);
if ((strlen(cur_locale) < 4) || if ((strlen(cur_locale) < 4) ||
(strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) { (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) {
// nope, don't use libc conversion // nope, don't use libc conversion