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

Merge branch 'generic-treectrl-cleanup'

Browse Source 
Improve wxGenericTreeCtrl code handling system colours/theme changes.

See #18823.
This commit is contained in:
Vadim Zeitlin
2020-07-15 14:26:55 +02:00
parent c14053c211 9cd3ab5ebd
commit 1bf5e536e9
2 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/generic/treectlg.h
View File

@@ -13,8 +13,9 @@
#if wxUSE_TREECTRL
#include "wx/scrolwin.h"
#include "wx/brush.h"
#include "wx/pen.h"
#include "wx/scrolwin.h"
// -----------------------------------------------------------------------------
// forward declaration
@@ -243,8 +244,8 @@ protected:
unsigned short m_indent;
int m_lineHeight;
wxPen m_dottedPen;
wxBrush *m_hilightBrush,
*m_hilightUnfocusedBrush;
wxBrush m_hilightBrush,
m_hilightUnfocusedBrush;
bool m_hasFocus;
bool m_dirty;
bool m_ownsImageListButtons;
@@ -351,9 +352,14 @@ protected:
virtual wxSize DoGetBestSize() const wxOVERRIDE;
private:
bool m_hasExplicitFont;
void OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
InitVisualAttributes();
}
void OnSysColourChanged(wxSysColourChangedEvent&);
// (Re)initialize colours, fonts, pens, brushes used by the control using
// the current system colours and font.
void InitVisualAttributes();
// Reset the state of the last find (i.e. keyboard incremental search)
// operation.