No real changes, just make wxWindow::CanScroll() virtual.

This will allow overriding it in wxScrolled<>, see #15440. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-27 13:12:31 +00:00
parent 8f96683438
commit 3d777efedc
2 changed files with 7 additions and 5 deletions
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1221,11 +1221,7 @@ public:
    // ----------

        // can the window have the scrollbar in this orientation?
-    bool CanScroll(int orient) const
-    {
-        return (m_windowStyle &
-                (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
-    }
+    virtual bool CanScroll(int orient) const;

        // does the window have the scrollbar in this orientation?
    bool HasScrollbar(int orient) const;