X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1146627e2bf16a48554e1c224f427dbd6247c5d..d4052bcb78b0ba58ec357b47faa15c92465def20:/src/os2/utils.cpp diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index 6cc381d718..80f9a04b3c 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,12 +16,11 @@ #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 #ifdef __EMX__ @@ -46,7 +45,7 @@ #include #endif -static const wxChar WX_SECTION[] = _T("wxWindows"); +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"); @@ -84,13 +83,13 @@ 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); @@ -147,7 +146,6 @@ bool wxShell( { wxChar* zShell = _T("CMD.EXE"); wxString sInputs; - wxChar zTmp[255]; STARTDATA SData = {0}; PSZ PgmTitle = "Command Shell"; APIRET rc; @@ -198,6 +196,13 @@ bool wxShell( return (rc != 0); } +// Shutdown or reboot the PC +bool wxShutdown(wxShutdownFlags wFlags) +{ + // TODO + return FALSE; +} + // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) long wxGetFreeMemory() { @@ -255,27 +260,18 @@ bool wxSetEnv(const wxString& variable, const wxChar *value) #endif } - -// Sleep for nSecs seconds. Attempt a Windows implementation using timers. -static bool inTimer = FALSE; - -class wxSleepTimer: public wxTimer +void wxMilliSleep( + unsigned long ulMilliseconds +) { -public: - inline void Notify() - { - inTimer = FALSE; - Stop(); - } -}; - -static wxTimer* wxTheSleepTimer = NULL; + ::DosSleep(ulMilliseconds); +} -void wxUsleep( - unsigned long ulMilliseconds +void wxMicroSleep( + unsigned long ulMicroseconds ) { - ::DosSleep(ulMilliseconds/1000l); + ::DosSleep(ulMicroseconds/1000); } void wxSleep( @@ -291,6 +287,8 @@ void wxFlushEvents() // wxYield(); } +#if WXWIN_COMPATIBILITY_2_2 + // Output a debug mess., in a system dependent fashion. void wxDebugMsg( const wxChar* zFmt ... @@ -312,7 +310,7 @@ void wxError( , const wxString& rTitle ) { - wxBuffer = new wxChar[256]; + wxChar *wxBuffer = new wxChar[256]; wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg); if (::WinMessageBox( HWND_DESKTOP ,NULL @@ -343,22 +341,30 @@ void wxFatalError( DosExit(EXIT_PROCESS, ulRc); } +#endif // WXWIN_COMPATIBILITY_2_2 + // Emit a beeeeeep void wxBell() { DosBeep(1000,1000); // 1kHz during 1 sec. } -// Chris Breeze 27/5/98: revised WIN32 code to -// detect WindowsNT correctly -int wxGetOsVersion( - int* pMajorVsn -, int* pMinorVsn -) + +void wxAppTraits::InitializeGui(unsigned long &ulHab) +{ +} + +void wxAppTraits::TerminateGui(unsigned long ulHab) { +} + +wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo() +{ + static wxToolkitInfo vInfo; ULONG ulSysInfo[QSV_MAX] = {0}; APIRET ulrc; + vInfo.name = _T("wxBase"); ulrc = ::DosQuerySysInfo( 1L ,QSV_MAX ,(PVOID)ulSysInfo @@ -366,277 +372,11 @@ int wxGetOsVersion( ); if (ulrc == 0L) { - *pMajorVsn = ulSysInfo[QSV_VERSION_MAJOR]; - *pMajorVsn = *pMajorVsn/10; - *pMinorVsn = ulSysInfo[QSV_VERSION_MINOR]; - return wxWINDOWS_OS2; - } - return wxWINDOWS; // error if we get here, return generic value -} - -// 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 -) -{ - HAB hab = 0; - HINI hIni = 0; - - 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; -} - -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, float fValue -, const wxString& rFile -) -{ - wxChar zBuf[50]; - - wxSprintf(zBuf, "%.4f", fValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); -} - -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, long lValue -, const wxString& rFile -) -{ - wxChar zBuf[50]; - - wxSprintf(zBuf, "%ld", lValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); -} - -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, int lValue -, const wxString& rFile -) -{ - wxChar zBuf[50]; - - wxSprintf(zBuf, "%d", lValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); -} - -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, wxChar** ppValue -, const wxString& rFile -) -{ - HAB hab = 0; - HINI hIni = 0; - wxChar zDefunkt[] = _T("$$default"); - char zBuf[1000]; - - if (rFile != "") - { - hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile); - if (hIni != 0L) - { - ULONG n = ::PrfQueryProfileString( hIni - ,(PSZ)WXSTRINGCAST rSection - ,(PSZ)WXSTRINGCAST rEntry - ,(PSZ)zDefunkt - ,(PVOID)zBuf - ,1000 - ); - if (zBuf == NULL) - return FALSE; - if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0) - return FALSE; - zBuf[n-1] = '\0'; - } - else - return FALSE; + vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10; + vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR]; } - else - { - ULONG n = ::PrfQueryProfileString( HINI_PROFILE - ,(PSZ)WXSTRINGCAST rSection - ,(PSZ)WXSTRINGCAST rEntry - ,(PSZ)zDefunkt - ,(PVOID)zBuf - ,1000 - ); - if (zBuf == NULL) - return FALSE; - if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0) - return FALSE; - zBuf[n-1] = '\0'; - } - strcpy((char*)*ppValue, zBuf); - return TRUE; -} - -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, float* pValue -, const wxString& rFile -) -{ - wxChar* zStr = NULL; - - zStr = new wxChar[1000]; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); - - if (bSucc) - { - *pValue = (float)wxStrtod(zStr, NULL); - delete[] zStr; - return TRUE; - } - else - { - delete[] zStr; - return FALSE; - } -} - -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, long* pValue -, const wxString& rFile -) -{ - wxChar* zStr = NULL; - - zStr = new wxChar[1000]; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); - - if (bSucc) - { - *pValue = wxStrtol(zStr, NULL, 10); - delete[] zStr; - return TRUE; - } - else - { - delete[] zStr; - return FALSE; - } -} - -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, int* pValue -, const wxString& rFile -) -{ - wxChar* zStr = NULL; - - zStr = new wxChar[1000]; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); - - if (bSucc) - { - *pValue = (int)wxStrtol(zStr, NULL, 10); - delete[] zStr; - return TRUE; - } - else - { - delete[] zStr; - 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 -) -{ - 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() -{ - wxCHECK_RET( gs_wxBusyCursorCount > 0 - ,_T("no matching wxBeginBusyCursor() for wxEndBusyCursor()") - ); - - if (--gs_wxBusyCursorCount == 0) - { - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursorOld); - gs_wxBusyCursorOld = 0; - } -} - -// TRUE if we're between the above two calls -bool wxIsBusy() -{ - return (gs_wxBusyCursorCount > 0); + vInfo.os = wxOS2_PM; + return vInfo; } // --------------------------------------------------------------------------- @@ -647,18 +387,24 @@ 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("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(); } @@ -670,7 +416,7 @@ wxChar* wxGetUserHome ( wxChar* zHome; wxString sUser1(rUser); - wxBuffer = new wxChar[256]; + char *wxBuffer = new wxChar[256]; #ifndef __EMX__ if (sUser1 != _T("")) { @@ -699,7 +445,7 @@ wxChar* wxGetUserHome ( if ((zHome = wxGetenv(_T("HOME"))) != NULL) { wxStrcpy(wxBuffer, zHome); - Unix2DosFilename(wxBuffer); + wxUnix2DosFilename(wxBuffer); wxStrcpy(zHome, wxBuffer); delete[] wxBuffer; return zHome; @@ -709,150 +455,6 @@ wxChar* wxGetUserHome ( 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 = 0; - HWND hwndFilter = NULLHANDLE; - HWND hwndWin= (HWND) pWnd->GetHWND(); - - while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE)) - { - ::WinDispatchMsg(hab, &vMsg); - } - return TRUE;//*** temporary? - } - else - { - wxFAIL_MSG(_T("pWnd==NULL !!!")); - return FALSE;//*** temporary? - } -} - -void wxGetMousePosition( - int* pX -, int* pY -) -{ - POINTL vPt; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPt); - *pX = vPt.x; - *pY = vPt.y; -}; - -// Return TRUE if we have a colour display -bool wxColourDisplay() -{ -#if 0 - HPS hpsScreen; - HDC hdcScreen; - LONG lColors; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLORS, 1L, &lColors); - return(lColors > 1L); -#else - // I don't see how the PM display could not be color. Besides, this - // was leaking DCs and PSs!!! MN - return TRUE; -#endif -} - -// Returns depth of screen -int wxDisplayDepth() -{ - HPS hpsScreen; - HDC hdcScreen; - LONG lPlanes; - LONG lBitsPerPixel; - static LONG nDepth = 0; - - // The screen colordepth ain't gonna change. No reason to query - // it over and over! - if (!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); - ::WinReleasePS(hpsScreen); - } - return (nDepth); -} - -// Get size of display -void wxDisplaySize( - int* pWidth -, int* pHeight -) -{ - HPS hpsScreen; - HDC hdcScreen; - static LONG lWidth = 0; - static LONG lHeight = 0; - - // The screen size ain't gonna change either so just cache the values - if (!lWidth) { - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth); - ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight); - ::DevCloseDC(hdcScreen); - ::WinReleasePS(hpsScreen); - } - *pWidth = (int)lWidth; - *pHeight = (int)lHeight; -} - -void wxDisplaySizeMM( - int* pWidth -, int* pHeight -) -{ - HPS hpsScreen; - HDC hdcScreen; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - - if (pWidth) - ::DevQueryCaps( hdcScreen - ,CAPS_HORIZONTAL_RESOLUTION - ,1L - ,(PLONG)pWidth - ); - if (pHeight) - ::DevQueryCaps( hdcScreen - ,CAPS_VERTICAL_RESOLUTION - ,1L - ,(PLONG)pHeight - ); - ::DevCloseDC(hdcScreen); - ::WinReleasePS(hpsScreen); -} - -void wxClientDisplayRect(int *x, int *y, int *width, int *height) -{ - // This is supposed to return desktop dimensions minus any window - // manager panels, menus, taskbars, etc. If there is a way to do that - // for this platform please fix this function, otherwise it defaults - // to the entire desktop. - if (x) *x = 0; - if (y) *y = 0; - wxDisplaySize(width, height); -} - - bool wxDirExists( const wxString& rDir ) @@ -860,56 +462,6 @@ bool wxDirExists( return (::DosSetCurrentDir(WXSTRINGCAST rDir)); } -// --------------------------------------------------------------------------- -// window information functions -// --------------------------------------------------------------------------- - -wxString WXDLLEXPORT wxGetWindowText( - WXHWND hWnd -) -{ - wxString vStr; - long lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1; - - ::WinQueryWindowText((HWND)hWnd, lLen, vStr.GetWriteBuf((int)lLen)); - vStr.UngetWriteBuf(); - - return vStr; -} - -wxString WXDLLEXPORT wxGetWindowClass( - WXHWND hWnd -) -{ - wxString vStr; - int nLen = 256; // some starting value - - for ( ;; ) - { - int nCount = ::WinQueryClassName((HWND)hWnd, nLen, vStr.GetWriteBuf(nLen)); - - vStr.UngetWriteBuf(); - if (nCount == nLen ) - { - // the class name might have been truncated, retry with larger - // buffer - nLen *= 2; - } - else - { - break; - } - } - return vStr; -} - -WXWORD WXDLLEXPORT wxGetWindowId( - WXHWND hWnd -) -{ - return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID); -} - wxString WXDLLEXPORT wxPMErrorToStr( ERRORID vError ) @@ -968,327 +520,11 @@ wxString WXDLLEXPORT wxPMErrorToStr( return(sError); } // end of wxPMErrorToStr -void wxDrawBorder( - HPS hPS -, RECTL& rRect -, WXDWORD dwStyle -) -{ - POINTL vPoint[2]; - - vPoint[0].x = rRect.xLeft; - vPoint[0].y = rRect.yBottom; - ::GpiMove(hPS, &vPoint[0]); - if (dwStyle & wxSIMPLE_BORDER || - dwStyle & wxSTATIC_BORDER) - { - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - } - if (dwStyle & wxSUNKEN_BORDER) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00FFFFFF; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vPoint[0].x = rRect.xLeft + 1; - vPoint[0].y = rRect.yBottom + 1; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 2; - vPoint[1].y = rRect.yTop - 2; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - - vLineBundle.lColor = 0x00000000; // BLACK - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 2; - vPoint[0].y = rRect.yBottom + 2; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 2; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 3; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - - vPoint[0].x = rRect.xLeft + 3; - vPoint[0].y = rRect.yBottom + 3; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 3; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 4; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - } - if (dwStyle & wxDOUBLE_BORDER) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00FFFFFF; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vLineBundle.lColor = 0x00000000; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 2; - vPoint[0].y = rRect.yBottom + 2; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 2; - vPoint[1].y = rRect.yTop - 2; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vLineBundle.lColor = 0x00FFFFFF; // BLACK - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 3; - vPoint[0].y = rRect.yBottom + 3; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 3; - vPoint[1].y = rRect.yTop - 3; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - } - if (dwStyle & wxRAISED_BORDER) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00000000; // BLACK - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vPoint[0].x = rRect.xLeft + 1; - vPoint[0].y = rRect.yBottom + 1; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 2; - vPoint[1].y = rRect.yTop - 2; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - - vLineBundle.lColor = 0x00FFFFFF; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 2; - vPoint[0].y = rRect.yBottom + 2; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 2; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 3; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - - vPoint[0].x = rRect.xLeft + 3; - vPoint[0].y = rRect.yBottom + 3; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 3; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 4; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - } -} // end of wxDrawBorder +// replacement for implementation in unix/utilsunx.cpp, +// to be used by all X11 based ports. +struct wxEndProcessData; -void wxOS2SetFont( - HWND hWnd -, const wxFont& rFont -) +void wxHandleProcessTermination(wxEndProcessData *proc_data) { - char zFont[128]; - char zFacename[30]; - char zWeight[30]; - char zStyle[30]; - - if (hWnd == NULLHANDLE) - return; - - // - // The fonts available for Presentation Params are just three - // outline fonts, the rest are available to the GPI, so we must - // map the families to one of these three - // - switch(rFont.GetFamily()) - { - case wxSCRIPT: - strcpy(zFacename, "Script"); - break; - - case wxDECORATIVE: - case wxROMAN: - strcpy(zFacename,"Tms Rmn"); - break; - - case wxTELETYPE: - strcpy(zFacename, "Courier"); - break; - - case wxMODERN: - strcpy(zFacename, "System Vio"); - break; - - case wxSWISS: - strcpy(zFacename, "Helv"); - break; - - case wxDEFAULT: - default: - strcpy(zFacename, "System Vio"); - break; - } - - switch(rFont.GetWeight()) - { - default: - case wxNORMAL: - case wxLIGHT: - zWeight[0] = '\0'; - break; - - case wxBOLD: - case wxFONTWEIGHT_MAX: - strcpy(zWeight, "Bold"); - break; - } - - switch(rFont.GetStyle()) - { - case wxITALIC: - case wxSLANT: - strcpy(zStyle, "Italic"); - break; - - default: - zStyle[0] = '\0'; - break; - } - sprintf(zFont, "%d.%s", rFont.GetPointSize(), zFacename); - if (zWeight[0] != '\0') - { - strcat(zFont, " "); - strcat(zFont, zWeight); - } - if (zStyle[0] != '\0') - { - strcat(zFont, " "); - strcat(zFont, zStyle); - } - ::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont) + 1, (PVOID)zFont); -} // end of wxOS2SetFont + // For now, just do nothing. To be filled in as needed. +}