X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/accel.cpp?ds=sidebyside diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp index 34be764815..fc5f2a319b 100644 --- a/src/os2/accel.cpp +++ b/src/os2/accel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: accel.cpp +// Name: src/os2/accel.cpp // Purpose: wxAcceleratorTable // Author: David Webster // Modified by: @@ -12,16 +12,15 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/accel.h" + #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/window.h" -#include "wx/app.h" -#include "wx/frame.h" + #include + #include "wx/window.h" + #include "wx/app.h" + #include "wx/frame.h" #endif -#include "wx/os2/accel.h" - #include "wx/os2/private.h" @@ -32,7 +31,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); inline HACCEL GetHACCEL() const { return m_hAccel; } protected: @@ -44,7 +43,7 @@ protected: wxAcceleratorRefData::wxAcceleratorRefData() { - m_ok = FALSE; + m_ok = false; m_hAccel = 0; } // end of wxAcceleratorRefData::wxAcceleratorRefData @@ -76,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 @@ -169,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) { @@ -189,13 +188,11 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const return (WXHACCEL) M_ACCELDATA->m_hAccel; } -bool wxAcceleratorTable::Translate( - WXHWND hWnd -, WXMSG* pWxmsg -) const +bool wxAcceleratorTable::Translate( WXHWND hWnd, + WXMSG* pWxmsg ) const { - PQMSG pMsg = (PQMSG)pWxmsg; - BOOL rc = FALSE; + PQMSG pMsg = (PQMSG)pWxmsg; + BOOL rc = FALSE; rc = ::WinTranslateAccel( vHabmain ,(HWND)hWnd