X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/accel.cpp diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp index db62b9bf36..c65092363e 100644 --- a/src/os2/accel.cpp +++ b/src/os2/accel.cpp @@ -75,7 +75,7 @@ wxAcceleratorTable::wxAcceleratorTable( m_refData = new wxAcceleratorRefData; - ulId = atol((char*)rResource.c_str()); + ulId = atol(rResource.c_str()); hAccel = ::WinLoadAccelTable( vHabmain ,NULL // resources always in .exe ,(ULONG)ulId @@ -168,10 +168,10 @@ wxAcceleratorTable::wxAcceleratorTable( M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0); } // end of wxAcceleratorTable::wxAcceleratorTable -bool wxAcceleratorTable::Ok() const +bool wxAcceleratorTable::IsOk() const { return(M_ACCELDATA && (M_ACCELDATA->m_ok)); -} // end of wxAcceleratorTable::Ok +} // end of wxAcceleratorTable::IsOk void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel) { @@ -199,7 +199,7 @@ bool wxAcceleratorTable::Translate( WXHWND hWnd, ,GetHaccel() ,pMsg ); - return (Ok() && rc); + return (IsOk() && rc); } // end of wxAcceleratorTable::Translate // ---------------------------------------------------------------------------