Layout fixes due to measuring with the wrong font. Also added

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

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index 21a745b598d4b42e84d4b6d2941c66be70030ea5..a50bed3218af14a6dee3ffc239ee58b6a076086e 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "accel.h"
 #endif
 
     #pragma implementation "accel.h"
 #endif
 


@@ -55,15 +55,19 @@ class wxAccelRefData : public wxObjectRefData
 public:
     wxAccelRefData()
     {
 public:
     wxAccelRefData()
     {

-        m_accels.DeleteContents(TRUE);

     }
 
     wxAccelRefData(const wxAccelRefData& data)
     }
 
     wxAccelRefData(const wxAccelRefData& data)

+        : wxObjectRefData()

     {
     {

-        m_accels.DeleteContents(TRUE);

         m_accels = data.m_accels;
     }
 
         m_accels = data.m_accels;
     }
 

+    virtual ~wxAccelRefData()
+    {
+        WX_CLEAR_LIST(wxAccelList, m_accels);
+    }
+

     wxAccelList m_accels;
 };
 
     wxAccelList m_accels;
 };
 


@@ -85,7 +89,7 @@ wxAcceleratorTable::wxAcceleratorTable()
 {
 }
 
 {
 }
 

-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])

 {
     m_refData = new wxAccelRefData;
 
 {
     m_refData = new wxAccelRefData;
 


@@ -132,14 +136,15 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
 {
     AllocExclusive();
 
 {
     AllocExclusive();
 

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

     while ( node )
     {
         const wxAcceleratorEntry *entryCur = node->GetData();
 
         if ( *entryCur == entry )
         {
     while ( node )
     {
         const wxAcceleratorEntry *entryCur = node->GetData();
 
         if ( *entryCur == entry )
         {

-            M_ACCELDATA->m_accels.DeleteNode(node);
+            delete node->GetData();
+            M_ACCELDATA->m_accels.Erase(node);

 
             return;
         }
 
             return;
         }


@@ -163,7 +168,7 @@ wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const
         return NULL;
     }
 
         return NULL;
     }
 

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

     while ( node )
     {
         const wxAcceleratorEntry *entry = node->GetData();
     while ( node )
     {
         const wxAcceleratorEntry *entry = node->GetData();


@@ -176,8 +181,7 @@ wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const
             // now check flags
             if ( (((flags & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
                  (((flags & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&
             // now check flags
             if ( (((flags & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
                  (((flags & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&

-                 (((flags & wxACCEL_ALT) != 0) ==
-                    (event.AltDown() || event.MetaDown())) )
+                 (((flags & wxACCEL_ALT) != 0) == event.AltDown()) )

             {
                 return entry;
             }
             {
                 return entry;
             }