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

Make wxGridSelection to be non-friend to wxGrid

Browse Source 
Improve integrity of the wxGridSelection internal data by removing `friend`
declaration.
This commit is contained in:
Ilya Sinitsyn
2020-02-25 21:11:29 +07:00
committed by Vadim Zeitlin
parent 79219fdbb2
commit 673ed29d7b
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/wx/generic/gridsel.h
View File

@@ -71,6 +71,31 @@ public:
void UpdateRows( size_t pos, int numRows );
void UpdateCols( size_t pos, int numCols );
const wxGridCellCoordsArray& GetCellSelection() const
{
return m_cellSelection;
}
const wxGridCellCoordsArray& GetBlockSelectionTopLeft() const
{
return m_blockSelectionTopLeft;
}
const wxGridCellCoordsArray& GetBlockSelectionBottomRight() const
{
return m_blockSelectionBottomRight;
}
const wxArrayInt& GetRowSelection() const
{
return m_rowSelection;
}
const wxArrayInt& GetColSelection() const
{
return m_colSelection;
}
private:
int BlockContain( int topRow1, int leftCol1,
int bottomRow1, int rightCol1,
@@ -106,8 +131,6 @@ private:
wxGrid *m_grid;
wxGrid::wxGridSelectionModes m_selectionMode;
friend class WXDLLIMPEXP_FWD_CORE wxGrid;
wxDECLARE_NO_COPY_CLASS(wxGridSelection);
};

10
src/generic/grid.cpp
View File

@@ -10044,7 +10044,7 @@ wxGridCellCoordsArray wxGrid::GetSelectedCells() const
return a;
}
return m_selection->m_cellSelection;
return m_selection->GetCellSelection();
}
wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
@@ -10055,7 +10055,7 @@ wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
return a;
}
return m_selection->m_blockSelectionTopLeft;
return m_selection->GetBlockSelectionTopLeft();
}
wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
@@ -10066,7 +10066,7 @@ wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
return a;
}
return m_selection->m_blockSelectionBottomRight;
return m_selection->GetBlockSelectionBottomRight();
}
wxArrayInt wxGrid::GetSelectedRows() const
@@ -10077,7 +10077,7 @@ wxArrayInt wxGrid::GetSelectedRows() const
return a;
}
return m_selection->m_rowSelection;
return m_selection->GetRowSelection();
}
wxArrayInt wxGrid::GetSelectedCols() const
@@ -10088,7 +10088,7 @@ wxArrayInt wxGrid::GetSelectedCols() const
return a;
}
return m_selection->m_colSelection;
return m_selection->GetColSelection();
}
void wxGrid::ClearSelection()