#include "wx/utils.h"
#ifndef WX_PRECOMP
- #include "wx/app.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/os2/private.h"
#include "wx/apptrait.h"
+#include "wx/filename.h"
#include <ctype.h>
#ifdef __EMX__
wxChar* zSysname;
const wxChar* zDefaultHost = _T("noname");
- if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
+ if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL &&
+ (zSysname = wxGetenv(_T("HOSTNAME"))) == NULL)
{
::PrfQueryProfileString( HINI_PROFILE
,(PSZ)WX_SECTION
SData.PgmName = (char*)zShell;
sInputs = _T("/C ") + rCommand;
- SData.PgmInputs = (BYTE*)sInputs.c_str();
+ SData.PgmInputs = (BYTE*)sInputs.wx_str();
SData.TermQ = 0;
SData.Environment = 0;
SData.InheritOpt = SSF_INHERTOPT_SHELL;
return true;
}
-bool wxSetEnv(const wxString& variable, const wxChar *value)
+bool wxSetEnv(const wxString& variable, const char *value)
{
#if defined(HAVE_SETENV)
- return setenv(variable.mb_str(), value ? wxString(value).mb_str().data()
- : NULL, 1 /* overwrite */) == 0;
+ return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
#elif defined(HAVE_PUTENV)
wxString s = variable;
if ( value )
#endif
}
+bool wxSetEnv(const wxString& variable, const wxString& value)
+{
+ return wxDoSetEnv(variable, value.mb_str());
+}
+
+bool wxUnsetEnv(const wxString& variable)
+{
+ return wxDoSetEnv(variable, NULL);
+}
+
void wxMilliSleep(
unsigned long ulMilliseconds
)
wxString wxGetOsDescription()
{
wxString strVer(_T("OS/2"));
- ULONG ulSysInfo[QSV_MAX] = {0};
+ ULONG ulSysInfo = 0;
- if (::DosQuerySysInfo( 1L,
- QSV_MAX,
- (PVOID)ulSysInfo,
- sizeof(ULONG) * QSV_MAX
+ if (::DosQuerySysInfo( QSV_VERSION_MINOR,
+ QSV_VERSION_MINOR,
+ (PVOID)&ulSysInfo,
+ sizeof(ULONG)
) == 0L )
{
wxString ver;
- ver.Printf( _T(" ver. %d.%d rev. %c"),
- int(ulSysInfo[QSV_VERSION_MAJOR] / 10),
- int(ulSysInfo[QSV_VERSION_MINOR]),
- char(ulSysInfo[QSV_VERSION_REVISION])
+ ver.Printf( _T(" ver. %d.%d"),
+ int(ulSysInfo / 10),
+ int(ulSysInfo % 10)
);
strVer += ver;
}
return strVer;
}
+bool wxIsPlatform64Bit()
+{
+ // FIXME: No idea how to test for 64 bit processor
+ // (Probably irrelevant anyhow, though).
+ return false;
+}
+
void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
{
}
{
}
-wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{
- static wxToolkitInfo vInfo;
- ULONG ulSysInfo[QSV_MAX] = {0};
+ ULONG ulSysInfo = 0;
APIRET ulrc;
- vInfo.name = _T("wxBase");
- ulrc = ::DosQuerySysInfo( 1L
- ,QSV_MAX
- ,(PVOID)ulSysInfo
- ,sizeof(ULONG) * QSV_MAX
+ ulrc = ::DosQuerySysInfo( QSV_VERSION_MINOR,
+ QSV_VERSION_MINOR,
+ (PVOID)&ulSysInfo,
+ sizeof(ULONG)
);
+
if (ulrc == 0L)
{
- vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10;
- vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR];
+ if ( verMaj )
+ *verMaj = ulSysInfo / 10;
+ if ( verMin )
+ *verMin = ulSysInfo % 10;
}
- vInfo.os = wxOS2_PM;
- return vInfo;
+
+ return wxOS_OS2;
}
+
// ---------------------------------------------------------------------------
const wxChar* wxGetHomeDir(
wxString* pStr
return (wxChar*)wxEmptyString; // No home known!
}
+bool wxGetDiskSpace(const wxString& path,
+ wxDiskspaceSize_t *pTotal,
+ wxDiskspaceSize_t *pFree)
+{
+ if (path.empty())
+ return false;
+
+ wxFileName fn(path);
+ FSALLOCATE fsaBuf = {0};
+ APIRET rc = NO_ERROR;
+ ULONG disknum = 0;
+
+ fn.MakeAbsolute();
+
+ if (wxDirExists(fn.GetFullPath()) == false)
+ return false;
+
+ disknum = 1 + wxToupper(fn.GetVolume().GetChar(0)) - _T('A');
+
+ rc = ::DosQueryFSInfo(disknum, // 1 = A, 2 = B, 3 = C, ...
+ FSIL_ALLOC, // allocation info
+ (PVOID)&fsaBuf,
+ sizeof(FSALLOCATE));
+
+ if (rc != NO_ERROR)
+ return false;
+ else
+ {
+ if(pTotal)
+ {
+ // to try to avoid 32-bit overflow, let's not multiply right away
+ // (num of alloc units)
+ *pTotal = fsaBuf.cUnit;
+ // * (num of sectors per alloc unit) * (num of bytes per sector)
+ (*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
+ }
+ if(pFree)
+ {
+ *pFree = fsaBuf.cUnitAvail;
+ (*pFree) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
+ }
+ return true;
+ }
+}
+
wxString wxPMErrorToStr(ERRORID vError)
{
wxString sError;
sError = wxT("Valid name format, but cannot find name in atom table");
break;
+ case PMERR_INV_HPS:
+ sError = wxT("PMERR_INV_HPS");
+ break;
+
+ case PMERR_PS_BUSY:
+ sError = wxT("PMERR_PS_BUSY");
+ break;
+
+ case PMERR_INV_PRIMITIVE_TYPE:
+ sError = wxT("PMERR_INV_PRIMITIVE_TYPE");
+ break;
+
+ case PMERR_UNSUPPORTED_ATTR:
+ sError = wxT("PMERR_UNSUPPORTED_ATTR");
+ break;
+
+ case PMERR_INV_COLOR_ATTR:
+ sError = wxT("PMERR_INV_COLOR_ATTR");
+ break;
+
+ case PMERR_INV_BACKGROUND_COL_ATTR:
+ sError = wxT("PMERR_INV_BACKGROUND_COL_ATTR");
+ break;
+
+ case PMERR_INV_MIX_ATTR:
+ sError = wxT("PMERR_INV_MIX_ATTR");
+ break;
+
+ case PMERR_INV_LINE_WIDTH_ATTR:
+ sError = wxT("PMERR_INV_LINE_WIDTH_ATTR");
+ break;
+
+ case PMERR_INV_GEOM_LINE_WIDTH_ATTR:
+ sError = wxT("PMERR_INV_GEOM_LINE_WIDTH_ATTR");
+ break;
+
+ case PMERR_INV_LINE_TYPE_ATTR:
+ sError = wxT("PMERR_INV_LINE_TYPE_ATTR");
+ break;
+
+ case PMERR_INV_LINE_END_ATTR:
+ sError = wxT("PMERR_INV_LINE_END_ATTR");
+ break;
+
+ case PMERR_INV_LINE_JOIN_ATTR:
+ sError = wxT("PMERR_INV_LINE_JOIN_ATTR");
+ break;
+
+ case PMERR_INV_CHAR_SET_ATTR:
+ sError = wxT("PMERR_INV_CHAR_SET_ATTR");
+ break;
+
+ case PMERR_INV_CHAR_MODE_ATTR:
+ sError = wxT("PMERR_INV_CHAR_MODE_ATTR");
+ break;
+
+ case PMERR_INV_CHAR_DIRECTION_ATTR:
+ sError = wxT("PMERR_INV_CHAR_DIRECTION_ATTR");
+ break;
+
+ case PMERR_INV_CHAR_SHEAR_ATTR:
+ sError = wxT("PMERR_INV_CHAR_SHEAR_ATTR");
+ break;
+
+ case PMERR_INV_CHAR_ANGLE_ATTR:
+ sError = wxT("PMERR_INV_CHAR_ANGLE_ATTR");
+ break;
+
+ case PMERR_INV_MARKER_SET_ATTR:
+ sError = wxT("PMERR_INV_MARKER_SET_ATTR");
+ break;
+
+ case PMERR_INV_MARKER_SYMBOL_ATTR:
+ sError = wxT("PMERR_INV_MARKER_SYMBOL_ATTR");
+ break;
+
+ case PMERR_INV_PATTERN_SET_ATTR:
+ sError = wxT("PMERR_INV_PATTERN_SET_ATTR");
+ break;
+
+ case PMERR_INV_PATTERN_ATTR:
+ sError = wxT("PMERR_INV_PATTERN_ATTR");
+ break;
+
+ case PMERR_INV_COORDINATE:
+ sError = wxT("PMERR_INV_COORDINATE");
+ break;
+
+ case PMERR_UNSUPPORTED_ATTR_VALUE:
+ sError = wxT("PMERR_UNSUPPORTED_ATTR_VALUE");
+ break;
+
+ case PMERR_INV_PATTERN_SET_FONT:
+ sError = wxT("PMERR_INV_PATTERN_SET_FONT");
+ break;
+
+ case PMERR_HUGE_FONTS_NOT_SUPPORTED:
+ sError = wxT("PMERR_HUGE_FONTS_NOT_SUPPORTED");
+ break;
+
default:
sError = wxT("Unknown error");
}
projects / wxWidgets.git / blobdiff