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

Fix SetWindowStyleFlag() override

Browse Source 
Base class SetWindowStyle() is not virtual
This commit is contained in:
Paul Cornett
2016-01-16 10:40:23 -08:00
parent 976e3115b7
commit c557f66eaf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,7 @@ public:
virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE;
virtual bool SetFont( const wxFont &font ) wxOVERRIDE; virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
virtual void SetWindowStyle(const long styles); virtual void SetWindowStyleFlag(long styles) wxOVERRIDE;
// callbacks // callbacks
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );

2
src/generic/treectlg.cpp
View File

@@ -1096,7 +1096,7 @@ wxGenericTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
return ((wxGenericTreeItem*) item.m_pItem)->GetChildrenCount(recursively); return ((wxGenericTreeItem*) item.m_pItem)->GetChildrenCount(recursively);
} }
void wxGenericTreeCtrl::SetWindowStyle(const long styles) void wxGenericTreeCtrl::SetWindowStyleFlag(long styles)
{ {
// Do not try to expand the root node if it hasn't been created yet // Do not try to expand the root node if it hasn't been created yet
if (m_anchor && !HasFlag(wxTR_HIDE_ROOT) && (styles & wxTR_HIDE_ROOT)) if (m_anchor && !HasFlag(wxTR_HIDE_ROOT) && (styles & wxTR_HIDE_ROOT))