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
This commit is contained in:
Vadim Zeitlin
2002-05-28 16:51:14 +00:00
parent c2569f41b1
commit 3c67451472
9 changed files with 9 additions and 9 deletions

View File

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
{ {
public: public:
wxAcceleratorTable(); wxAcceleratorTable();
wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
virtual ~wxAcceleratorTable(); virtual ~wxAcceleratorTable();
wxAcceleratorTable(const wxAcceleratorTable& accel) wxAcceleratorTable(const wxAcceleratorTable& accel)

View File

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
public: public:
wxAcceleratorTable(); wxAcceleratorTable();
wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
// Copy constructors // Copy constructors
wxAcceleratorTable(const wxAcceleratorTable& accel) wxAcceleratorTable(const wxAcceleratorTable& accel)

View File

@@ -26,7 +26,7 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
public: public:
wxAcceleratorTable(); wxAcceleratorTable();
wxAcceleratorTable(const wxString& resource); // Load from .rc resource 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 // Copy constructors
wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }

View File

@@ -35,7 +35,7 @@ public:
wxAcceleratorTable(); wxAcceleratorTable();
wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
wxAcceleratorTable( int n wxAcceleratorTable( int n
,wxAcceleratorEntry vaEntries[] ,const wxAcceleratorEntry vaEntries[]
); // Load from array ); // Load from array
// Copy constructors // Copy constructors

View File

@@ -86,7 +86,7 @@ wxAcceleratorTable::wxAcceleratorTable()
{ {
} }
wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[]) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{ {
m_refData = new wxAccelRefData; m_refData = new wxAccelRefData;

View File

@@ -65,7 +65,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
} }
// Create from an array // Create from an array
wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[]) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{ {
m_refData = new wxAcceleratorRefData; m_refData = new wxAcceleratorRefData;

View File

@@ -65,7 +65,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
} }
// Create from an array // Create from an array
wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[]) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{ {
m_refData = new wxAcceleratorRefData; m_refData = new wxAcceleratorRefData;

View File

@@ -65,7 +65,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& WXUNUSED(resource))
} }
// Create from an array // Create from an array
wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[]) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{ {
wxAcceleratorRefData* data = new wxAcceleratorRefData; wxAcceleratorRefData* data = new wxAcceleratorRefData;
m_refData = data; m_refData = data;

View File

@@ -105,7 +105,7 @@ extern int wxCharCodeWXToOS2(
// Create from an array // Create from an array
wxAcceleratorTable::wxAcceleratorTable( wxAcceleratorTable::wxAcceleratorTable(
int n int n
, wxAcceleratorEntry vaEntries[] , const wxAcceleratorEntry vaEntries[]
) )
{ {
int nAccelLength = ((sizeof(ACCEL) * n) + sizeof(ACCELTABLE)); int nAccelLength = ((sizeof(ACCEL) * n) + sizeof(ACCELTABLE));