Switch off the tests on Windows and switch back on the email notifications.

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

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index bcc71c83dbfe636c98ecaf51d5b2dc8e26d94929..fc5f2a319b4c8ad5be8c07b36c424d7543646be6 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -12,15 +12,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/accel.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/frame.h"
+    #include <stdio.h>
+    #include "wx/window.h"
+    #include "wx/app.h"
+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/os2/accel.h"
-

 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 
 


@@ -31,7 +31,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:
     wxAcceleratorRefData();
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:
     wxAcceleratorRefData();

-    ~wxAcceleratorRefData();
+    virtual ~wxAcceleratorRefData();

 
     inline HACCEL GetHACCEL() const { return m_hAccel; }
 protected:
 
     inline HACCEL GetHACCEL() const { return m_hAccel; }
 protected:


@@ -43,7 +43,7 @@ protected:
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 {
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 {

-    m_ok = FALSE;
+    m_ok = false;

     m_hAccel = 0;
 } // end of wxAcceleratorRefData::wxAcceleratorRefData
 
     m_hAccel = 0;
 } // end of wxAcceleratorRefData::wxAcceleratorRefData
 


@@ -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)
 {


@@ -188,13 +188,11 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
     return (WXHACCEL) M_ACCELDATA->m_hAccel;
 }
 
     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
 
     rc = ::WinTranslateAccel( vHabmain
                              ,(HWND)hWnd