Add a couple of missing forward declarations.

[wxWidgets.git] / src / os2 / accel.cpp

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index db62b9bf36bf73edfe4d80df0d76f1e685c6e9b5..c65092363e75cab008d6a33557b2dc91758077f7 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -75,7 +75,7 @@ wxAcceleratorTable::wxAcceleratorTable(
 
     m_refData = new wxAcceleratorRefData;
 
 
     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
     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
 
     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));
 {
     return(M_ACCELDATA && (M_ACCELDATA->m_ok));

-} // end of wxAcceleratorTable::Ok
+} // end of wxAcceleratorTable::IsOk

 
 void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
 {
 
 void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
 {


@@ -199,7 +199,7 @@ bool wxAcceleratorTable::Translate( WXHWND  hWnd,
                              ,GetHaccel()
                              ,pMsg
                             );
                              ,GetHaccel()
                              ,pMsg
                             );

-    return (Ok() && rc);
+    return (IsOk() && rc);

 } // end of wxAcceleratorTable::Translate
 
 // ---------------------------------------------------------------------------
 } // end of wxAcceleratorTable::Translate
 
 // ---------------------------------------------------------------------------