X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/476607a777ec5328804da0564364b70128725647..7dd40b6f4b31e6bc9c7f626f1461aff8adf7714c:/src/os2/utils.cpp?ds=sidebyside diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index abea758038..ccf622b9a2 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -6,7 +6,7 @@ // Created: 09/17/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -16,15 +16,16 @@ #include "wx/setup.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/cursor.h" #endif //WX_PRECOMP #include "wx/os2/private.h" -#include "wx/timer.h" #include "wx/intl.h" +#include "wx/apptrait.h" #include -#include +#ifdef __EMX__ +#include +#endif #include "wx/log.h" @@ -36,19 +37,21 @@ #include #include -#define INCL_DOS -#define INCL_PM -#define INCL_GPI -#include #define PURE_32 -#include -#include -#include -static const wxChar WX_SECTION[] = _T("wxWindows"); +#if defined(__WATCOMC__) +extern "C" +{ + #include +} +#elif !defined(__EMX__) + #include + #include + #include +#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 @@ -65,9 +68,9 @@ bool wxGetHostName( char zServer[256]; char zComputer[256]; unsigned long ulLevel = 0; - unsigned char* zBuffer; - unsigned long ulBuffer; - unsigned long* pulTotalAvail; + unsigned char* zBuffer = NULL; + unsigned long ulBuffer = 256; + unsigned long* pulTotalAvail = NULL; NetBios32GetInfo( (const unsigned char*)zServer ,(const unsigned char*)zComputer @@ -83,53 +86,46 @@ bool wxGetHostName( if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL) { - ULONG n = ::PrfQueryProfileString( HINI_PROFILE - ,(PSZ)WX_SECTION - ,(PSZ)eHOSTNAME - ,(PSZ)zDefaultHost - ,(void*)zBuf - ,(ULONG)nMaxSize - 1 - ); + ::PrfQueryProfileString( HINI_PROFILE + ,(PSZ)WX_SECTION + ,(PSZ)eHOSTNAME + ,(PSZ)zDefaultHost + ,(void*)zBuf + ,(ULONG)nMaxSize - 1 + ); } else 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) { - 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; - return FALSE; + long lrc = U32ELOCU((PUCHAR)zBuf, (PULONG)&nType); + if (lrc == 0) return true; +#endif + 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 -, int nSig -) +int wxKill(long lPid, + wxSignal WXUNUSED(eSig), + wxKillError* WXUNUSED(peError), + int WXUNUSED(flags)) { return((int)::DosKillProcess(0, (PID)lPid)); } @@ -143,7 +139,6 @@ bool wxShell( { wxChar* zShell = _T("CMD.EXE"); wxString sInputs; - wxChar zTmp[255]; STARTDATA SData = {0}; PSZ PgmTitle = "Command Shell"; APIRET rc; @@ -157,10 +152,10 @@ bool wxShell( SData.FgBg = SSF_FGBG_FORE; SData.TraceOpt = SSF_TRACEOPT_NONE; SData.PgmTitle = PgmTitle; - SData.PgmName = zShell; + SData.PgmName = (char*)zShell; - sInputs = "/C " + rCommand; - SData.PgmInputs = NULL; //(BYTE*)sInputs.c_str(); + sInputs = _T("/C ") + rCommand; + SData.PgmInputs = (BYTE*)sInputs.c_str(); SData.TermQ = 0; SData.Environment = 0; SData.InheritOpt = SSF_INHERTOPT_SHELL; @@ -177,7 +172,7 @@ bool wxShell( SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf); rc = ::DosStartSession(&SData, &ulSessID, &vPid); - if (rc == 0) + if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND { PTIB ptib; PPIB ppib; @@ -194,375 +189,173 @@ bool wxShell( return (rc != 0); } -// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) -long wxGetFreeMemory( - void* pMemptr -) -{ - ULONG lSize; - ULONG lMemFlags; - APIRET rc; - - lMemFlags = PAG_FREE; - rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags); - if (rc != 0) - return -1L; - return (long)lSize; -} - -// Sleep for nSecs seconds. Attempt a Windows implementation using timers. -static bool inTimer = FALSE; - -class wxSleepTimer: public wxTimer -{ -public: - inline void Notify() - { - inTimer = FALSE; - Stop(); - } -}; - -static wxTimer* wxTheSleepTimer = NULL; - -void wxUsleep( - unsigned long ulMilliseconds -) +// Shutdown or reboot the PC +bool wxShutdown(wxShutdownFlags WXUNUSED(wFlags)) { - ::DosSleep(ulMilliseconds); + // TODO + return false; } -void wxSleep( - int nSecs -) +wxPowerType wxGetPowerType() { - ::DosSleep(1000 * nSecs); + // TODO + return wxPOWER_UNKNOWN; } -// Consume all events until no more left -void wxFlushEvents() +wxBatteryState wxGetBatteryState() { -// wxYield(); + // TODO + return wxBATTERY_UNKNOWN_STATE; } -// Output a debug mess., in a system dependent fashion. -void wxDebugMsg( - const wxChar* zFmt ... -) +// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) +wxMemorySize wxGetFreeMemory() { - va_list vAp; - static wxChar zBuffer[512]; - - if (!wxTheApp->GetWantDebugOutput()) - return ; - va_start(vAp, zFmt); - sprintf(zBuffer, zFmt, vAp) ; - va_end(vAp); -} + void* pMemptr = NULL; + LONG lSize; + ULONG lMemFlags; + APIRET rc; -// Non-fatal error: pop up message box and (possibly) continue -void wxError( - const wxString& rMsg -, const wxString& rTitle -) -{ - wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg); - if (::WinMessageBox( HWND_DESKTOP - ,NULL - ,(PSZ)wxBuffer - ,(PSZ)WXSTRINGCAST rTitle - ,0 - ,MB_ICONEXCLAMATION | MB_YESNO - ) == MBID_YES) - wxExit(); + lMemFlags = PAG_FREE; + rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags); + if (rc != 0) + lSize = -1L; + return (wxMemorySize)lSize; } -// Fatal error: pop up message box and abort -void wxFatalError( - const wxString& rMsg -, const wxString& rTitle -) +// Get Process ID +unsigned long wxGetProcessId() { - unsigned long ulRc; - - ulRc = ::WinMessageBox( HWND_DESKTOP - ,NULL - ,WXSTRINGCAST rMsg - ,WXSTRINGCAST rTitle - ,0 - ,MB_NOICON | MB_OK - ); - DosExit(EXIT_PROCESS, ulRc); + return (unsigned long)getpid(); } -// Emit a beeeeeep -void wxBell() -{ - DosBeep(1000,1000); // 1kHz during 1 sec. -} +// ---------------------------------------------------------------------------- +// env vars +// ---------------------------------------------------------------------------- -// Chris Breeze 27/5/98: revised WIN32 code to -// detect WindowsNT correctly -int wxGetOsVersion( - int* pMajorVsn -, int* pMinorVsn -) +bool wxGetEnv(const wxString& var, wxString *value) { - ULONG ulSysInfo[QSV_MAX] = {0}; + // wxGetenv is defined as getenv() + wxChar *p = wxGetenv(var); + if ( !p ) + return false; - if (::DosQuerySysInfo( 1L - ,QSV_MAX - ,(PVOID)ulSysInfo - ,sizeof(ULONG) * QSV_MAX - )) + if ( value ) { - *pMajorVsn = ulSysInfo[QSV_VERSION_MAJOR]; - *pMinorVsn = ulSysInfo[QSV_VERSION_MINOR]; - return wxWINDOWS_OS2; + *value = p; } - return wxWINDOWS; // error if we get here, return generic value + + return true; } -// Reading and writing resources (eg WIN.INI, .Xdefaults) -#if wxUSE_RESOURCES -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, const wxString& rValue -, const wxString& rFile -) +bool wxSetEnv(const wxString& variable, const wxChar *value) { - HAB hab; - HINI hIni; +#if defined(HAVE_SETENV) + return setenv(variable.mb_str(), value ? wxString(value).mb_str().data() + : NULL, 1 /* overwrite */) == 0; +#elif defined(HAVE_PUTENV) + wxString s = variable; + if ( value ) + s << _T('=') << value; - if (rFile != "") - { - hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile); - if (hIni != 0L) - { - return (::PrfWriteProfileString( hIni - ,(PSZ)WXSTRINGCAST rSection - ,(PSZ)WXSTRINGCAST rEntry - ,(PSZ)WXSTRINGCAST rValue - )); - } - } - else - return (::PrfWriteProfileString( HINI_PROFILE - ,(PSZ)WXSTRINGCAST rSection - ,(PSZ)WXSTRINGCAST rEntry - ,(PSZ)WXSTRINGCAST rValue - )); - return FALSE; + // transform to ANSI + const char *p = s.mb_str(); + + // the string will be free()d by libc + char *buf = (char *)malloc(strlen(p) + 1); + strcpy(buf, p); + + return putenv(buf) == 0; +#else // no way to set an env var + wxUnusedVar(variable); + wxUnusedVar(value); + return false; +#endif } -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, float fValue -, const wxString& rFile +void wxMilliSleep( + unsigned long ulMilliseconds ) { - wxChar zBuf[50]; - - wxSprintf(zBuf, "%.4f", fValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); + ::DosSleep(ulMilliseconds); } -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, long lValue -, const wxString& rFile +void wxMicroSleep( + unsigned long ulMicroseconds ) { - wxChar zBuf[50]; - - wxSprintf(zBuf, "%ld", lValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); + ::DosSleep(ulMicroseconds/1000); } -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, int lValue -, const wxString& rFile +void wxSleep( + int nSecs ) { - wxChar zBuf[50]; - - wxSprintf(zBuf, "%d", lValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); + ::DosSleep(1000 * nSecs); } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, wxChar** ppValue -, const wxString& rFile -) +// Consume all events until no more left +void wxFlushEvents() { - HAB hab; - HINI hIni; - static const wxChar zDefunkt[] = _T("$$default"); - - if (rFile != "") - { - hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile); - if (hIni != 0L) - { - ULONG n = ::PrfQueryProfileString( hIni - ,(PSZ)WXSTRINGCAST rSection - ,(PSZ)WXSTRINGCAST rEntry - ,(PSZ)zDefunkt - ,(void*)wxBuffer - ,1000 - ); - if (n == 0L || wxStrcmp(wxBuffer, zDefunkt) == 0) - return FALSE; - } - else - return FALSE; - } - else - { - ULONG n = ::PrfQueryProfileString( HINI_PROFILE - ,(PSZ)WXSTRINGCAST rSection - ,(PSZ)WXSTRINGCAST rEntry - ,(PSZ)zDefunkt - ,(void*)wxBuffer - ,1000 - ); - if (n == 0L || wxStrcmp(wxBuffer, zDefunkt) == 0) - return FALSE; - } - if (*ppValue) - delete[] (*ppValue); - *ppValue = copystring(wxBuffer); - return TRUE; +// wxYield(); } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, float* pValue -, const wxString& rFile -) +// Emit a beeeeeep +void wxBell() { - wxChar* zStr = NULL; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); - - if (bSucc) - { - *pValue = (float)wxStrtod(zStr, NULL); - delete[] zStr; - return TRUE; - } - else return FALSE; + DosBeep(1000,1000); // 1kHz during 1 sec. } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, long* pValue -, const wxString& rFile -) +wxString wxGetOsDescription() { - wxChar* zStr = NULL; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); - - if (bSucc) + wxString strVer(_T("OS/2")); + ULONG ulSysInfo[QSV_MAX] = {0}; + + if (::DosQuerySysInfo( 1L, + QSV_MAX, + (PVOID)ulSysInfo, + sizeof(ULONG) * QSV_MAX + ) == 0L ) { - *pValue = wxStrtol(zStr, NULL, 10); - delete[] zStr; - return TRUE; + 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]) + ); + strVer += ver; } - else return FALSE; + + return strVer; } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, int* pValue -, const wxString& rFile -) +void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab)) { - wxChar* zStr = NULL; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); - - if (bSucc) - { - *pValue = (int)wxStrtol(zStr, NULL, 10); - delete[] zStr; - return TRUE; - } - else return FALSE; } -#endif // wxUSE_RESOURCES -// --------------------------------------------------------------------------- -// helper functions for showing a "busy" cursor -// --------------------------------------------------------------------------- - -HCURSOR gs_wxBusyCursor = 0; // new, busy cursor -HCURSOR gs_wxBusyCursorOld = 0; // old cursor -static int gs_wxBusyCursorCount = 0; - -// Set the cursor to the busy cursor for all windows -void wxBeginBusyCursor( - wxCursor* pCursor -) +void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab)) { - if ( gs_wxBusyCursorCount++ == 0 ) - { - gs_wxBusyCursor = (HCURSOR)pCursor->GetHCURSOR(); - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursor); - } - //else: nothing to do, already set } -// Restore cursor to normal -void wxEndBusyCursor() +wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo() { - wxCHECK_RET( gs_wxBusyCursorCount > 0 - ,_T("no matching wxBeginBusyCursor() for wxEndBusyCursor()") - ); + static wxToolkitInfo vInfo; + ULONG ulSysInfo[QSV_MAX] = {0}; + APIRET ulrc; - if (--gs_wxBusyCursorCount == 0) + vInfo.name = _T("wxBase"); + ulrc = ::DosQuerySysInfo( 1L + ,QSV_MAX + ,(PVOID)ulSysInfo + ,sizeof(ULONG) * QSV_MAX + ); + if (ulrc == 0L) { - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursorOld); - gs_wxBusyCursorOld = 0; + vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10; + vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR]; } -} - -// TRUE if we're between the above two calls -bool wxIsBusy() -{ - return (gs_wxBusyCursorCount > 0); + vInfo.os = wxOS2_PM; + return vInfo; } // --------------------------------------------------------------------------- @@ -573,30 +366,40 @@ const wxChar* wxGetHomeDir( wxString& rStrDir = *pStr; // OS/2 has no idea about home, - // so use the working directory instead? + // so use the working directory instead. + // However, we might have a valid HOME directory, + // as is used on many machines that have unix utilities + // on them, so we should use that, if available. // 256 was taken from os2def.h #ifndef MAX_PATH # define MAX_PATH 256 #endif - char zDirName[256]; - ULONG ulDirLen; + const wxChar *szHome = wxGetenv((wxChar*)"HOME"); + if ( szHome == NULL ) { + // we're homeless, use current directory. + rStrDir = wxT("."); + } + else + rStrDir = szHome; - ::DosQueryCurrentDir(0, zDirName, &ulDirLen); - rStrDir = zDirName; return rStrDir.c_str(); } // 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); + wxChar* zHome; + wxString sUser1(rUser); - if (sUser1 != _T("")) + wxChar *wxBuffer = new wxChar[256]; +#ifndef __EMX__ + if (!sUser1.empty()) { wxChar zTmp[64]; @@ -610,162 +413,96 @@ wxChar* wxGetUserHome ( if ((zHome = wxGetenv(_T("TMP"))) != NULL || (zHome = wxGetenv(_T("TMPDIR"))) != NULL || (zHome = wxGetenv(_T("TEMP"))) != NULL) + delete[] wxBuffer; return *zHome ? zHome : (wxChar*)_T("\\"); } if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0) - sUser1 = _T(""); + sUser1 = wxEmptyString; } } - if (sUser1 == _T("")) +#endif + if (sUser1.empty()) + { if ((zHome = wxGetenv(_T("HOME"))) != NULL) { wxStrcpy(wxBuffer, zHome); - Unix2DosFilename(wxBuffer); - return wxBuffer; - } - return NULL; // No home known! -} - -// Check whether this window wants to process messages, e.g. Stop button -// in long calculations. -bool wxCheckForInterrupt( - wxWindow* pWnd -) -{ - if(pWnd) - { - QMSG vMsg; - HAB hab; - HWND hwndFilter; - HWND hwndWin= (HWND) pWnd->GetHWND(); - - while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE)) - { - ::WinDispatchMsg(hab, &vMsg); + wxUnix2DosFilename(wxBuffer); +#if wxUSE_UNICODE + wxWCharBuffer retBuffer (wxBuffer); + delete[] wxBuffer; + return retBuffer; +#else + wxStrcpy(zHome, wxBuffer); + delete[] wxBuffer; + return zHome; +#endif } - return TRUE;//*** temporary? - } - else - { - wxFAIL_MSG(_T("pWnd==NULL !!!")); - return FALSE;//*** temporary? } + delete[] wxBuffer; + return (wxChar*)wxEmptyString; // No home known! } -void wxGetMousePosition( - int* pX -, int* pY -) +wxString WXDLLEXPORT wxPMErrorToStr(ERRORID vError) { - POINTL vPt; + wxString sError; - ::WinQueryPointerPos(HWND_DESKTOP, &vPt); - *pX = vPt.x; - *pY = vPt.y; -}; - -// Return TRUE if we have a colour display -bool wxColourDisplay() -{ - HPS hpsScreen; - HDC hdcScreen; - LONG lColors; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLORS, 1L, &lColors); - return(lColors > 1L); -} - -// Returns depth of screen -int wxDisplayDepth() -{ - HPS hpsScreen; - HDC hdcScreen; - LONG lPlanes; - LONG lBitsPerPixel; - LONG nDepth; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitsPerPixel); - - nDepth = (int)(lPlanes * lBitsPerPixel); - DevCloseDC(hdcScreen); - return (nDepth); -} + // + // Remove the high order byte -- it is useless + // + vError &= 0x0000ffff; + switch(vError) + { + case PMERR_INVALID_HWND: + sError = wxT("Invalid window handle specified"); + break; -// Get size of display -void wxDisplaySize( - int* pWidth -, int* pHeight -) -{ - HPS hpsScreen; - HDC hdcScreen; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, (PLONG)pWidth); - ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, (PLONG)pHeight); - DevCloseDC(hdcScreen); -} + case PMERR_INVALID_FLAG: + sError = wxT("Invalid flag bit set"); + break; -bool wxDirExists( - const wxString& rDir -) -{ - return (::DosSetCurrentDir(WXSTRINGCAST rDir)); -} + case PMERR_NO_MSG_QUEUE: + sError = wxT("No message queue available"); + break; -// --------------------------------------------------------------------------- -// window information functions -// --------------------------------------------------------------------------- + case PMERR_INVALID_PARM: + sError = wxT("Parameter contained invalid data"); + break; -wxString WXDLLEXPORT wxGetWindowText( - WXHWND hWnd -) -{ - wxString vStr; - long lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1; + case PMERR_INVALID_PARAMETERS: + sError = wxT("Parameter value is out of range"); + break; - ::WinQueryWindowText((HWND)hWnd, lLen, vStr.GetWriteBuf((int)lLen)); - vStr.UngetWriteBuf(); + case PMERR_PARAMETER_OUT_OF_RANGE: + sError = wxT("Parameter value is out of range"); + break; - return vStr; -} + case PMERR_INVALID_INTEGER_ATOM: + sError = wxT("Not a valid atom"); + break; -wxString WXDLLEXPORT wxGetWindowClass( - WXHWND hWnd -) -{ - wxString vStr; - int nLen = 256; // some starting value + case PMERR_INVALID_HATOMTBL: + sError = wxT("Atom table handle is invalid"); + break; - for ( ;; ) - { - int nCount = ::WinQueryClassName((HWND)hWnd, nLen, vStr.GetWriteBuf(nLen)); + case PMERR_INVALID_ATOM_NAME: + sError = wxT("Not a valid atom name"); + break; - vStr.UngetWriteBuf(); - if (nCount == nLen ) - { - // the class name might have been truncated, retry with larger - // buffer - nLen *= 2; - } - else - { + case PMERR_ATOM_NAME_NOT_FOUND: + sError = wxT("Valid name format, but cannot find name in atom table"); break; - } + + default: + sError = wxT("Unknown error"); } - return vStr; -} + return(sError); +} // end of wxPMErrorToStr -WXWORD WXDLLEXPORT wxGetWindowId( - WXHWND hWnd -) +// replacement for implementation in unix/utilsunx.cpp, +// to be used by all X11 based ports. +struct wxEndProcessData; + +void wxHandleProcessTermination(wxEndProcessData *WXUNUSED(proc_data)) { - return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID); + // For now, just do nothing. To be filled in as needed. } -