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

Make wxGrid::SetLabelXXX() work when using native header as well

Browse Source 
Allow changing label colours and font of the native column header too.

Closes https://github.com/wxWidgets/wxWidgets/pull/1762

Closes #18605.
This commit is contained in:
ali kettab
2020-03-12 22:04:41 +01:00
committed by Vadim Zeitlin
parent 95eea38eb0
commit 40cbea298d
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/grid.cpp
View File

@@ -6497,8 +6497,15 @@ bool wxGrid::UseNativeColHeader(bool native)
CreateColumnWindow(); CreateColumnWindow();
if ( m_useNativeHeader ) if ( m_useNativeHeader )
{
SetNativeHeaderColCount(); SetNativeHeaderColCount();
wxHeaderCtrl* const colHeader = GetGridColHeader();
colHeader->SetBackgroundColour( GetLabelBackgroundColour() );
colHeader->SetForegroundColour( GetLabelTextColour() );
colHeader->SetFont( GetLabelFont() );
}
CalcWindowSizes(); CalcWindowSizes();
return true; return true;
@@ -7980,6 +7987,10 @@ void wxGrid::SetLabelTextColour( const wxColour& colour )
if ( m_labelTextColour != colour ) if ( m_labelTextColour != colour )
{ {
m_labelTextColour = colour; m_labelTextColour = colour;
if ( IsUsingNativeHeader() )
GetGridColHeader()->SetForegroundColour( colour );
if ( ShouldRefresh() ) if ( ShouldRefresh() )
{ {
m_rowLabelWin->Refresh(); m_rowLabelWin->Refresh();
@@ -7991,6 +8002,10 @@ void wxGrid::SetLabelTextColour( const wxColour& colour )
void wxGrid::SetLabelFont( const wxFont& font ) void wxGrid::SetLabelFont( const wxFont& font )
{ {
m_labelFont = font; m_labelFont = font;
if ( IsUsingNativeHeader() )
GetGridColHeader()->SetFont( font );
if ( ShouldRefresh() ) if ( ShouldRefresh() )
{ {
m_rowLabelWin->Refresh(); m_rowLabelWin->Refresh();