diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 9243f60a9d..4fec700066 100644
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -200,7 +200,7 @@ public:
     virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE;
 
     virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
-    virtual void SetWindowStyle(const long styles);
+    virtual void SetWindowStyleFlag(long styles) wxOVERRIDE;
 
     // callbacks
     void OnPaint( wxPaintEvent &event );
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 5f5f451529..4d6a91451c 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -1096,7 +1096,7 @@ wxGenericTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
     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
     if (m_anchor && !HasFlag(wxTR_HIDE_ROOT) && (styles & wxTR_HIDE_ROOT))