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

some (blind) compilation fixes after wxString/Unicode changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-03 00:36:08 +00:00
parent 48d16e09ad
commit ce903b6f06
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os2/utils.cpp
View File

@@ -226,7 +226,7 @@ unsigned long wxGetProcessId()
bool wxGetEnv(const wxString& var, wxString *value) bool wxGetEnv(const wxString& var, wxString *value)
{ {
// wxGetenv is defined as getenv() // wxGetenv is defined as getenv()
wxChar *p = wxGetenv(var); wxChar *p = wxGetenv((const wxChar *)var);
if ( !p ) if ( !p )
return false; return false;
@@ -238,7 +238,7 @@ bool wxGetEnv(const wxString& var, wxString *value)
return true; return true;
} }
bool wxSetEnv(const wxString& variable, const char *value) static bool wxDoSetEnv(const wxString& variable, const char *value)
{ {
#if defined(HAVE_SETENV) #if defined(HAVE_SETENV)
return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0; return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
@@ -395,11 +395,7 @@ const wxChar* wxGetHomeDir(
} }
// Hack for OS/2 // Hack for OS/2
#if wxUSE_UNICODE
const wxMB2WXbuf wxGetUserHome( const wxString &rUser )
#else // just for binary compatibility -- there is no 'const' here
wxChar* wxGetUserHome ( const wxString &rUser ) wxChar* wxGetUserHome ( const wxString &rUser )
#endif
{ {
wxChar* zHome; wxChar* zHome;
wxString sUser1(rUser); wxString sUser1(rUser);
@@ -466,7 +462,7 @@ bool wxGetDiskSpace(const wxString& path,
if (wxDirExists(fn.GetFullPath()) == false) if (wxDirExists(fn.GetFullPath()) == false)
return false; return false;
disknum = 1 + wxToupper(fn.GetVolume().GetChar(0)) - _T('A'); disknum = wxToupper(fn.GetVolume().GetChar(0)) - _T('A') + 1;
rc = ::DosQueryFSInfo(disknum, // 1 = A, 2 = B, 3 = C, ... rc = ::DosQueryFSInfo(disknum, // 1 = A, 2 = B, 3 = C, ...
FSIL_ALLOC, // allocation info FSIL_ALLOC, // allocation info