avoid setting initial position if it was not specified, broken in r70734

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

diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index 616e9b00c8d342d4bd409e5fecab174f50d0fe3e..389f6fb5f24cb63e8ae353e86177dacc46c64474 100644 (file)
--- a/src/osx/accel.cpp
+++ b/src/osx/accel.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,8 +18,6 @@
     #include "wx/string.h"
 #endif
 
-#ifndef __WXUNIVERSAL__
-
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 // ----------------------------------------------------------------------------
@@ -88,17 +85,17 @@ bool wxAcceleratorTable::IsOk() const
 
 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()) &&
-           (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
+           (((entry->GetFlags() & wxACCEL_RAW_CTRL) != 0) == event.RawControlDown()) &&
            (((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.ControlDown()))
         {
             return entry->GetCommand();
         }
@@ -108,6 +105,4 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
     return -1;
 }
 
-#endif
-
 #endif // wxUSE_ACCEL