X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..d10e22fe8ad283f37b1809349028ffc282e393ce:/src/os2/utilsgui.cpp diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp index e64fc12f9b..dc2651beef 100644 --- a/src/os2/utilsgui.cpp +++ b/src/os2/utilsgui.cpp @@ -28,10 +28,11 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/cursor.h" + #include "wx/font.h" + #include "wx/timer.h" #endif //WX_PRECOMP #include "wx/apptrait.h" -#include "wx/timer.h" #include "wx/os2/private.h" // includes @@ -44,29 +45,27 @@ // ---------------------------------------------------------------------------- // Sleep for nSecs seconds. Attempt a Windows implementation using timers. -static bool inTimer = FALSE; +static bool inTimer = false; class wxSleepTimer: public wxTimer { public: inline void Notify() { - inTimer = FALSE; + inTimer = false; Stop(); } }; // 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 wxWriteResource( const wxString& rSection, + const wxString& rEntry, + const wxString& rValue, + const wxString& rFile ) { - HAB hab = 0; - HINI hIni = 0; + HAB hab = 0; + HINI hIni = 0; if (!rFile.empty()) { @@ -86,7 +85,7 @@ bool wxWriteResource( ,(PSZ)WXSTRINGCAST rEntry ,(PSZ)WXSTRINGCAST rValue )); - return FALSE; + return false; } bool wxWriteResource( @@ -123,34 +122,26 @@ bool wxWriteResource( ); } -bool wxWriteResource( - const wxString& rSection -, const wxString& rEntry -, int lValue -, const wxString& rFile -) +bool wxWriteResource( const wxString& rSection, + const wxString& rEntry, + int lValue, + const wxString& rFile ) { - wxChar zBuf[50]; + wxChar zBuf[50]; wxSprintf(zBuf, "%d", lValue); - return wxWriteResource( rSection - ,rEntry - ,zBuf - ,rFile - ); + return wxWriteResource( rSection, rEntry, zBuf, rFile ); } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, wxChar** ppValue -, const wxString& 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]; + HAB hab = 0; + HINI hIni = 0; + wxChar zDefunkt[] = _T("$$default"); + char zBuf[1000]; if (!rFile.empty()) { @@ -165,13 +156,13 @@ bool wxGetResource( ,1000 ); if (zBuf == NULL) - return FALSE; + return false; if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0) - return FALSE; + return false; zBuf[n-1] = '\0'; } else - return FALSE; + return false; } else { @@ -183,100 +174,70 @@ bool wxGetResource( ,1000 ); if (zBuf == NULL) - return FALSE; + return false; if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0) - return FALSE; + return false; zBuf[n-1] = '\0'; } strcpy((char*)*ppValue, zBuf); - return TRUE; + return true; } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, float* pValue -, const wxString& rFile -) +bool wxGetResource( const wxString& rSection, + const wxString& rEntry, + float* pValue, + const wxString& rFile ) { - wxChar* zStr = NULL; + wxChar* zStr = NULL; zStr = new wxChar[1000]; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); + bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile ); if (bSucc) { *pValue = (float)wxStrtod(zStr, NULL); - delete[] zStr; - return TRUE; - } - else - { - delete[] zStr; - return FALSE; } + + delete[] zStr; + return bSucc; } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, long* pValue -, const wxString& rFile -) +bool wxGetResource( const wxString& rSection, + const wxString& rEntry, + long* pValue, + const wxString& rFile ) { - wxChar* zStr = NULL; + wxChar* zStr = NULL; zStr = new wxChar[1000]; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); + bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile ); if (bSucc) { *pValue = wxStrtol(zStr, NULL, 10); - delete[] zStr; - return TRUE; - } - else - { - delete[] zStr; - return FALSE; } + + delete[] zStr; + return bSucc; } -bool wxGetResource( - const wxString& rSection -, const wxString& rEntry -, int* pValue -, const wxString& rFile -) +bool wxGetResource( const wxString& rSection, + const wxString& rEntry, + int* pValue, + const wxString& rFile ) { - wxChar* zStr = NULL; + wxChar* zStr = NULL; zStr = new wxChar[1000]; - bool bSucc = wxGetResource( rSection - ,rEntry - ,(wxChar **)&zStr - ,rFile - ); + 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; } + + delete[] zStr; + return bSucc; } #endif // wxUSE_RESOURCES @@ -313,7 +274,7 @@ void wxEndBusyCursor() } } -// TRUE if we're between the above two calls +// true if we're between the above two calls bool wxIsBusy() { return (gs_wxBusyCursorCount > 0); @@ -321,26 +282,24 @@ bool wxIsBusy() // Check whether this window wants to process messages, e.g. Stop button // in long calculations. -bool wxCheckForInterrupt( - wxWindow* pWnd -) +bool wxCheckForInterrupt( wxWindow* pWnd ) { if(pWnd) { - QMSG vMsg; - HAB hab = 0; - HWND hwndFilter = NULLHANDLE; + QMSG vMsg; + HAB hab = 0; + HWND hwndFilter = NULLHANDLE; while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE)) { ::WinDispatchMsg(hab, &vMsg); } - return TRUE;//*** temporary? + return true;//*** temporary? } else { wxFAIL_MSG(_T("pWnd==NULL !!!")); - return FALSE;//*** temporary? + return false;//*** temporary? } } @@ -362,7 +321,7 @@ void wxGetMousePosition( *pY = vPt.y; }; -// Return TRUE if we have a colour display +// Return true if we have a colour display bool wxColourDisplay() { #if 0 @@ -377,7 +336,7 @@ bool wxColourDisplay() #else // I don't see how the PM display could not be color. Besides, this // was leaking DCs and PSs!!! MN - return TRUE; + return true; #endif } @@ -479,32 +438,14 @@ void wxGUIAppTraits::TerminateGui(unsigned long ulHab) ::WinTerminate(ulHab); } -wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo() +wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const { - static wxToolkitInfo vInfo; - ULONG ulSysInfo[QSV_MAX] = {0}; - APIRET ulrc; - - vInfo.shortName = _T("PM"); - vInfo.name = _T("wxOS2"); -#ifdef __WXUNIVERSAL__ - vInfo.shortName << _T("univ"); - vInfo.name << _T("/wxUniversal"); -#endif - ulrc = ::DosQuerySysInfo( 1L - ,QSV_MAX - ,(PVOID)ulSysInfo - ,sizeof(ULONG) * QSV_MAX - ); - if (ulrc == 0L) - { - vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10; - vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR]; - } - vInfo.os = wxOS2_PM; - return vInfo; + // How to get version of PM ? I guess, just reusing the OS version is OK. + (void) wxGetOsVersion(verMaj, verMin); + return wxPORT_OS2; } + // --------------------------------------------------------------------------- // window information functions // ---------------------------------------------------------------------------