Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Declare array explicitly as a wxVector instead of using wxArrayPGProperty alias

Browse Source
This commit is contained in:
Artur Wieczorek
2018-11-01 18:19:55 +01:00
parent 5fbe3cab76
commit e7357eafa2
3 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/propgrid/propgrid.h
View File

@@ -1572,8 +1572,8 @@ protected:
wxPGCell m_unspecifiedAppearance;
// List of properties to be deleted/removed in idle event handler.
wxArrayPGProperty m_deletedProperties;
wxArrayPGProperty m_removedProperties;
wxVector<wxPGProperty*> m_deletedProperties;
wxVector<wxPGProperty*> m_removedProperties;
#if !WXWIN_COMPATIBILITY_3_0
// List of editors and their event handlers to be deleted in idle event handler.
@@ -2280,7 +2280,7 @@ public:
// added.
wxPGProperty* GetCurParent() const
{
return (wxPGProperty*) m_propHierarchy[m_propHierarchy.size()-1];
return m_propHierarchy.back();
}
wxPropertyGridPageState* GetState() { return m_state; }
@@ -2309,7 +2309,7 @@ protected:
wxPropertyGridPageState* m_state;
// Tree-hierarchy of added properties (that can have children).
wxArrayPGProperty m_propHierarchy;
wxVector<wxPGProperty*> m_propHierarchy;
// Hashmap for string-id to wxPGChoicesData mapping.
wxPGHashMapS2P m_dictIdChoices;