defer calling SetCanFocus() on wxGTK until after creation

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

diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index dbba6195bcae3ab25a2f6c00ce38a01e28e504eb..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
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -93,10 +92,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
     {
         wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&
     {
         wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&

-           (((entry->GetFlags() & wxACCEL_RAW_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_SHIFT) != 0) == event.ShiftDown()) &&
            (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) &&

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

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