X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/accel.cpp?ds=sidebyside

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index ff55bd2203..c65092363e 100644
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -31,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:
@@ -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
 
 // ---------------------------------------------------------------------------