Fit modeless preferences dialog to its contents too.

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

diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index d1d535207d1769750a448cf05206b43f39910847..90bd1fd920305c0b067816e52f465ec0bc54d9e6 100644 (file)
--- a/src/osx/accel.cpp
+++ b/src/osx/accel.cpp
@@ -11,14 +11,14 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_ACCEL
+

 #include "wx/accel.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 #endif
 
 #include "wx/accel.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 #endif
 

-#ifndef __WXUNIVERSAL__
-

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


@@ -86,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.RawControlDown()) &&

            (((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.ControlDown()))

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


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

-#endif
\ No newline at end of file
+#endif // wxUSE_ACCEL