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

Refactor wxGrid code to use SetNativeHeaderColXXX() functions

Browse Source 
Add two simple helpers: SetNativeHeaderColCount() and
SetNativeHeaderColOrder() and call the latter from the former to ensure
that the columns order is always correct when switching to the native
control.
This commit is contained in:
Vadim Zeitlin
2019-07-15 15:13:42 +02:00
parent 3baeb6e834
commit a871229f8b
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/generic/grid.cpp
View File

@@ -2438,7 +2438,7 @@ wxGrid::SetTable(wxGridTableBase *table,
// Notice that this must be called after setting m_table as it uses it
// indirectly, via wxGrid::GetColLabelValue().
if ( m_useNativeHeader )
GetGridColHeader()->SetColumnCount(m_numCols);
SetNativeHeaderColCount();
m_selection = new wxGridSelection( this, selmode );
if (checkSelection)
@@ -4569,10 +4569,7 @@ void wxGrid::RefreshAfterColPosChange()
// and make the changes visible
if ( m_useNativeHeader )
{
if ( m_colAt.empty() )
GetGridColHeader()->ResetColumnsOrder();
else
GetGridColHeader()->SetColumnsOrder(m_colAt);
SetNativeHeaderColOrder();
}
else
{
@@ -5950,7 +5947,8 @@ void wxGrid::UseNativeColHeader(bool native)
CreateColumnWindow();
if ( m_useNativeHeader )
GetGridColHeader()->SetColumnCount(m_numCols);
SetNativeHeaderColCount();
CalcWindowSizes();
}
@@ -8494,6 +8492,25 @@ int wxGrid::GetRowMinimalAcceptableHeight() const
return m_minAcceptableRowHeight;
}
void wxGrid::SetNativeHeaderColCount()
{
wxASSERT_MSG( m_useNativeHeader, "no column header window" );
GetGridColHeader()->SetColumnCount(m_numCols);
SetNativeHeaderColOrder();
}
void wxGrid::SetNativeHeaderColOrder()
{
wxASSERT_MSG( m_useNativeHeader, "no column header window" );
if ( !m_colAt.empty() )
GetGridColHeader()->SetColumnsOrder(m_colAt);
else
GetGridColHeader()->ResetColumnsOrder();
}
// ----------------------------------------------------------------------------
// auto sizing
// ----------------------------------------------------------------------------