added consts to wxAcceleratorTable ctors from wxAcceleratorEntry array

(repaces patch 561183)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 290de47d1a717bd0ffcae97a7023c9ac37566034..2067e0fd23551e72f1f66ee5c0cee6e195ba51b4 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(const wxAcceleratorTable& accel)

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index 3586e6cefb5e8cfd0b8dd4c7c70a5f726cf2c0b4..4c1e71fb446e1b7a51f7e971ead7a9baea24fce9 100644 (file)
--- a/include/wx/mac/accel.h
+++ b/include/wx/mac/accel.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
     wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
     // Copy constructors
     wxAcceleratorTable(const wxAcceleratorTable& accel)

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 6b61e38b121f6acd8d9aa1f9a07cc11b3954d0ee..fa2b70bed816fc450e524fe1f6244fdb53de99d7 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
     
     // Copy constructors
     wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 6e33d02ee7bb2cbfd30729ab75c2f0eb008e49c8..f12542fd523b879922b58255c3615bd81c10f24c 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -35,7 +35,7 @@ public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
     wxAcceleratorTable( int                n
-                       ,wxAcceleratorEntry vaEntries[]
+                       ,const wxAcceleratorEntry vaEntries[]
                       ); // Load from array
 
     // Copy constructors

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index ff0483376b0ad01b2af60abc5b8fc45961277b7a..bede8f488c4f5e5ef0c189cd26a7a97d334c11fd 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -86,7 +86,7 @@ wxAcceleratorTable::wxAcceleratorTable()
 {
 }
 
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     m_refData = new wxAccelRefData;
 

diff --git a/src/mac/accel.cpp b/src/mac/accel.cpp
index 798aa720268d1268858fe239dd4baa9614ad1e7a..ca83c8db9a27a43acb6fca81011995678f4d34c7 100644 (file)
--- a/src/mac/accel.cpp
+++ b/src/mac/accel.cpp
@@ -65,7 +65,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 // Create from an array
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     m_refData = new wxAcceleratorRefData;
 

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 798aa720268d1268858fe239dd4baa9614ad1e7a..ca83c8db9a27a43acb6fca81011995678f4d34c7 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -65,7 +65,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 // Create from an array
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     m_refData = new wxAcceleratorRefData;
 

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index d90a47b95863a50650286ef580c7ca34b9aee979..7ce79051218c2c30f2656aa9896d8845185832f9 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -65,7 +65,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& WXUNUSED(resource))
 }
 
 // Create from an array
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     wxAcceleratorRefData* data = new wxAcceleratorRefData;
     m_refData = data;

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index 802a3867e4513413ed0640b95f23b96a92d8cc3a..09aa343e0a222e3c158736122bf2e3ab6a0401fe 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -105,7 +105,7 @@ extern int wxCharCodeWXToOS2(
 // Create from an array
 wxAcceleratorTable::wxAcceleratorTable(
   int                               n
-, wxAcceleratorEntry                vaEntries[]
+, const wxAcceleratorEntry          vaEntries[]
 )
 {
     int                             nAccelLength = ((sizeof(ACCEL) * n) + sizeof(ACCELTABLE));