Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index 616e9b00c8d342d4bd409e5fecab174f50d0fe3e..dbba6195bcae3ab25a2f6c00ce38a01e28e504eb 100644 (file)
--- a/src/osx/accel.cpp
+++ b/src/osx/accel.cpp
@@ -19,8 +19,6 @@
     #include "wx/string.h"
 #endif
 
     #include "wx/string.h"
 #endif
 

-#ifndef __WXUNIVERSAL__
-

 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 // ----------------------------------------------------------------------------
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 // ----------------------------------------------------------------------------


@@ -88,17 +86,17 @@ bool wxAcceleratorTable::IsOk() const
 
 int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
 
 int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {

-    if (!Ok()) return -1;
+    if (!IsOk()) return -1;

 
     wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
     while (node)
     {
         wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&
 
     wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
     while (node)
     {
         wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&

-           (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
+           (((entry->GetFlags() & wxACCEL_RAW_CTRL) != 0) == event.ControlDown()) &&

            (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&

-           (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) && 
-           (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown()))
+           (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) &&
+           (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.CmdDown()))

         {
             return entry->GetCommand();
         }
         {
             return entry->GetCommand();
         }


@@ -108,6 +106,4 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
     return -1;
 }
 
     return -1;
 }
 

-#endif
-

 #endif // wxUSE_ACCEL
 #endif // wxUSE_ACCEL