From 3c67451472112b3c7bb3b425cfab523b2d38d0cf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 28 May 2002 16:51:14 +0000 Subject: [PATCH] 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 --- include/wx/generic/accel.h | 2 +- include/wx/mac/accel.h | 2 +- include/wx/motif/accel.h | 2 +- include/wx/os2/accel.h | 2 +- src/generic/accel.cpp | 2 +- src/mac/accel.cpp | 2 +- src/mac/carbon/accel.cpp | 2 +- src/motif/accel.cpp | 2 +- src/os2/accel.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 290de47d1a..2067e0fd23 100644 --- 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 3586e6cefb..4c1e71fb44 100644 --- 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 6b61e38b12..fa2b70bed8 100644 --- 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 6e33d02ee7..f12542fd52 100644 --- 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 ff0483376b..bede8f488c 100644 --- 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 798aa72026..ca83c8db9a 100644 --- 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 798aa72026..ca83c8db9a 100644 --- 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 d90a47b958..7ce7905121 100644 --- 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 802a3867e4..09aa343e0a 100644 --- 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)); -- 2.47.2