fix a few hundreds of harmless unused parameters warnings and a couple of real bugs...

[wxWidgets.git] / src / mac / carbon / accel.cpp

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 14aa88e53a85fa2c05d76354fb15f32f314257d1..d15f4546263d171096e6b18466c39cb3ffbfc32f 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        accel.cpp
+// Name:        src/mac/carbon/accel.cpp
 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,25 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "accel.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
 #include "wx/accel.h"
-#include "wx/string.h"
 
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
 #endif
 
+IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+
 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)
 
 // ----------------------------------------------------------------------------
 // wxAccelRefData: the data used by wxAcceleratorTable
@@ -35,10 +33,10 @@ WX_DEFINE_LIST(wxAccelList);
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
-    friend class WXDLLEXPORT wxAcceleratorTable;
+    friend class wxAcceleratorTable;
 public:
     wxAcceleratorRefData();
-    ~wxAcceleratorRefData();
+    virtual ~wxAcceleratorRefData();
 
     wxAccelList m_accels;
 };
@@ -52,7 +50,7 @@ wxAcceleratorRefData::wxAcceleratorRefData()
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
-    m_accels.DeleteContents( TRUE );
+    WX_CLEAR_LIST( wxAccelList, m_accels );
 }
 
 wxAcceleratorTable::wxAcceleratorTable()
@@ -79,7 +77,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     }
 }
 
-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const
 {
     return (m_refData != NULL);
 }
@@ -88,14 +86,15 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
     if (!Ok()) return -1;
 
-    wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
+    wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
     while (node)
     {
-        wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();
+        wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
-           (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
+           (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown()) && 
+           (((entry->GetFlags() & wxACCEL_CMD) == 0) || event.CmdDown()))
         {
             return entry->GetCommand();
         }
@@ -104,5 +103,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 
     return -1;
 }
-
-