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:
parent
c2569f41b1
commit
3c67451472
9 changed files with 9 additions and 9 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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); }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ wxAcceleratorTable::wxAcceleratorTable()
|
|||
{
|
||||
}
|
||||
|
||||
wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
|
||||
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
|
||||
{
|
||||
m_refData = new wxAccelRefData;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue