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

Fix base class call of virtual SetFont() in wxGenericListCtrl

Browse Source 
Hard-coding 'wxWindow' improperly bypasses an override in wxControl on GTK3
This commit is contained in:
Paul Cornett
2020-01-27 11:27:39 -08:00
parent d03a5c1155
commit 26f58bdf78
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/listctrl.h
View File

@@ -32,8 +32,9 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxNavigationEnabled<wxListCtrlBase>, class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxNavigationEnabled<wxListCtrlBase>,
public wxScrollHelper public wxScrollHelper
{ {
public: typedef wxNavigationEnabled<wxListCtrlBase> BaseType;
public:
wxGenericListCtrl() : wxScrollHelper(this) wxGenericListCtrl() : wxScrollHelper(this)
{ {
Init(); Init();

2
src/generic/listctrl.cpp
View File

@@ -5462,7 +5462,7 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
bool wxGenericListCtrl::SetFont( const wxFont &font ) bool wxGenericListCtrl::SetFont( const wxFont &font )
{ {
if ( !wxWindow::SetFont( font ) ) if (!BaseType::SetFont(font))
return false; return false;
if (m_mainWin) if (m_mainWin)