renamed RGBColor setter to avoid former overload being an override

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

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 0623dc8dd504af42b604a1d22f89b4f6dbe7dd85..36ea09768813ba297a38ef80c01401d3491422b0 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -1,33 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.cpp
+// Name:        src/mac/carbon/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Purpose:     wxAcceleratorTable

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "accel.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"

 #include "wx/accel.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
 
 #endif
 

+IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+

 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
 #include "wx/listimpl.cpp"
 // ----------------------------------------------------------------------------
 // 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
 
 // ----------------------------------------------------------------------------
 // wxAccelRefData: the data used by wxAcceleratorTable


@@ -52,7 +50,7 @@ wxAcceleratorRefData::wxAcceleratorRefData()
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {

-    m_accels.DeleteContents( TRUE );
+    WX_CLEAR_LIST( wxAccelList, m_accels );

 }
 
 wxAcceleratorTable::wxAcceleratorTable()
 }
 
 wxAcceleratorTable::wxAcceleratorTable()


@@ -88,10 +86,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
     if (!Ok()) return -1;
 
 {
     if (!Ok()) return -1;
 

-    wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
+    wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();

     while (node)
     {
     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()) &&
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&


@@ -104,5 +102,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 
     return -1;
 }
 
     return -1;
 }

-
-