fix VC 7.x release build problems

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

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index d99b55cea6e24ee55fa7bcfb1026674ed0f40c70..bede8f488c4f5e5ef0c189cd26a7a97d334c11fd 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -53,7 +53,17 @@ WX_DEFINE_LIST(wxAccelList);
 class wxAccelRefData : public wxObjectRefData
 {
 public:
-    wxAccelRefData() { m_accels.DeleteContents(TRUE); }
+    wxAccelRefData()
+    {
+        m_accels.DeleteContents(TRUE);
+    }
+
+    wxAccelRefData(const wxAccelRefData& data)
+        : wxObjectRefData()
+    {
+        m_accels.DeleteContents(TRUE);
+        m_accels = data.m_accels;
+    }
 
     wxAccelList m_accels;
 };
@@ -61,6 +71,7 @@ public:
 // macro which can be used to access wxAccelRefData from wxAcceleratorTable
 #define M_ACCELDATA ((wxAccelRefData *)m_refData)
 
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -75,7 +86,7 @@ wxAcceleratorTable::wxAcceleratorTable()
 {
 }
 
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     m_refData = new wxAccelRefData;
 
@@ -108,6 +119,8 @@ bool wxAcceleratorTable::Ok() const
 
 void wxAcceleratorTable::Add(const wxAcceleratorEntry& entry)
 {
+    AllocExclusive();
+
     if ( !m_refData )
     {
         m_refData = new wxAccelRefData;
@@ -118,6 +131,8 @@ void wxAcceleratorTable::Add(const wxAcceleratorEntry& entry)
 
 void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
 {
+    AllocExclusive();
+
     wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
     while ( node )
     {
@@ -189,5 +204,15 @@ int wxAcceleratorTable::GetCommand(const wxKeyEvent& event) const
     return entry ? entry->GetCommand() : -1;
 }
 
+wxObjectRefData *wxAcceleratorTable::CreateRefData() const
+{
+    return new wxAccelRefData;
+}
+
+wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxAccelRefData(*(wxAccelRefData *)data);
+}
+
 #endif // wxUSE_ACCEL