#define PURE_32
-#ifndef __EMX__
-#include <upm.h>
-#include <netcons.h>
-#include <netbios.h>
+#if defined(__WATCOMC__)
+extern "C"
+{
+ #include <upm.h>
+}
+#elif !defined(__EMX__)
+ #include <upm.h>
+ #include <netcons.h>
+ #include <netbios.h>
#endif
static const wxChar WX_SECTION[] = _T("wxWidgets");
static const wxChar eHOSTNAME[] = _T("HostName");
-static const wxChar eUSERID[] = _T("UserId");
-static const wxChar eUSERNAME[] = _T("UserName");
// For the following functions we SHOULD fill in support
// for Windows-NT (which I don't know) as I assume it begin
wxStrncpy(zBuf, zSysname, nMaxSize - 1);
zBuf[nMaxSize] = _T('\0');
#endif
- return *zBuf ? TRUE : FALSE;
+ return *zBuf ? true : false;
}
// Get user ID e.g. jacs
-bool wxGetUserId(
- wxChar* zBuf
-, int nType
-)
+bool wxGetUserId(wxChar* zBuf, int nType)
{
-#if defined(__VISAGECPP__)
- long lrc;
+#if defined(__VISAGECPP__) || defined(__WATCOMC__)
// UPM procs return 0 on success
- lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
- if (lrc == 0) return TRUE;
+ long lrc = U32ELOCU((PUCHAR)zBuf, (PULONG)&nType);
+ if (lrc == 0) return true;
#endif
- return FALSE;
+ return false;
}
-bool wxGetUserName(
- wxChar* zBuf
-, int nMaxSize
-)
+bool wxGetUserName( wxChar* zBuf, int nMaxSize )
{
#ifdef USE_NET_API
- wxGetUserId( zBuf
- ,nMaxSize
- );
+ wxGetUserId( zBuf, nMaxSize );
#else
wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);
#endif
- return TRUE;
+ return true;
}
-int wxKill(
- long lPid
-, wxSignal eSig
-, wxKillError* peError
-, int flags
-)
+int wxKill(long lPid,
+ wxSignal WXUNUSED(eSig),
+ wxKillError* WXUNUSED(peError),
+ int WXUNUSED(flags))
{
return((int)::DosKillProcess(0, (PID)lPid));
}
SData.FgBg = SSF_FGBG_FORE;
SData.TraceOpt = SSF_TRACEOPT_NONE;
SData.PgmTitle = PgmTitle;
- SData.PgmName = zShell;
+ SData.PgmName = (char*)zShell;
- sInputs = "/C " + rCommand;
+ sInputs = _T("/C ") + rCommand;
SData.PgmInputs = (BYTE*)sInputs.c_str();
SData.TermQ = 0;
SData.Environment = 0;
}
// Shutdown or reboot the PC
-bool wxShutdown(wxShutdownFlags wFlags)
+bool wxShutdown(wxShutdownFlags WXUNUSED(wFlags))
+{
+ // TODO
+ return false;
+}
+
+wxPowerType wxGetPowerType()
{
// TODO
- return FALSE;
+ return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+ // TODO
+ return wxBATTERY_UNKNOWN_STATE;
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
{
void* pMemptr = NULL;
- ULONG lSize;
+ LONG lSize;
ULONG lMemFlags;
APIRET rc;
lMemFlags = PAG_FREE;
- rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags);
+ rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags);
if (rc != 0)
- return -1L;
- return (long)lSize;
+ lSize = -1L;
+ return (wxMemorySize)lSize;
+}
+
+// Get Process ID
+unsigned long wxGetProcessId()
+{
+ return (unsigned long)getpid();
}
// ----------------------------------------------------------------------------
// wxGetenv is defined as getenv()
wxChar *p = wxGetenv(var);
if ( !p )
- return FALSE;
+ return false;
if ( value )
{
*value = p;
}
- return TRUE;
+ return true;
}
bool wxSetEnv(const wxString& variable, const wxChar *value)
return putenv(buf) == 0;
#else // no way to set an env var
- return FALSE;
+ wxUnusedVar(variable);
+ wxUnusedVar(value);
+ return false;
#endif
}
}
-void wxAppTraits::InitializeGui(unsigned long &ulHab)
+void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
{
}
-void wxAppTraits::TerminateGui(unsigned long ulHab)
+void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
{
}
wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
{
- static wxToolkitInfo vInfo;
- ULONG ulSysInfo[QSV_MAX] = {0};
- APIRET ulrc;
+ static wxToolkitInfo vInfo;
+ ULONG ulSysInfo[QSV_MAX] = {0};
+ APIRET ulrc;
vInfo.name = _T("wxBase");
ulrc = ::DosQuerySysInfo( 1L
# define MAX_PATH 256
#endif
- const wxChar *szHome = wxGetenv("HOME");
+ const wxChar *szHome = wxGetenv((wxChar*)"HOME");
if ( szHome == NULL ) {
// we're homeless, use current directory.
rStrDir = wxT(".");
}
// Hack for OS/2
-wxChar* wxGetUserHome (
- const wxString& rUser
-)
+#if wxUSE_UNICODE
+const wxMB2WXbuf wxGetUserHome( const wxString &rUser )
+#else // just for binary compatibility -- there is no 'const' here
+wxChar* wxGetUserHome ( const wxString &rUser )
+#endif
{
wxChar* zHome;
wxString sUser1(rUser);
- char *wxBuffer = new wxChar[256];
+ wxChar *wxBuffer = new wxChar[256];
#ifndef __EMX__
- if (sUser1 != _T(""))
+ if (!sUser1.empty())
{
wxChar zTmp[64];
}
}
#endif
- if (sUser1 == _T(""))
+ if (sUser1.empty())
{
if ((zHome = wxGetenv(_T("HOME"))) != NULL)
{
wxStrcpy(wxBuffer, zHome);
wxUnix2DosFilename(wxBuffer);
+#if wxUSE_UNICODE
+ wxWCharBuffer retBuffer (wxBuffer);
+ delete[] wxBuffer;
+ return retBuffer;
+#else
wxStrcpy(zHome, wxBuffer);
delete[] wxBuffer;
return zHome;
+#endif
}
}
delete[] wxBuffer;
- return NULL; // No home known!
+ return (wxChar*)wxEmptyString; // No home known!
}
-bool wxDirExists(
- const wxString& rDir
-)
-{
- return (::DosSetCurrentDir(WXSTRINGCAST rDir));
-}
-
-wxString WXDLLEXPORT wxPMErrorToStr(
- ERRORID vError
-)
+wxString WXDLLEXPORT wxPMErrorToStr(ERRORID vError)
{
wxString sError;
// to be used by all X11 based ports.
struct wxEndProcessData;
-void wxHandleProcessTermination(wxEndProcessData *proc_data)
+void wxHandleProcessTermination(wxEndProcessData *WXUNUSED(proc_data))
{
// For now, just do nothing. To be filled in as needed.
}
projects / wxWidgets.git / blobdiff