]> git.saurik.com Git - wxWidgets.git/commitdiff
No real changes, just make wxWindow::CanScroll() virtual.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 27 Aug 2013 13:12:31 +0000 (13:12 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 27 Aug 2013 13:12:31 +0000 (13:12 +0000)
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

include/wx/window.h
src/common/wincmn.cpp

index bdb96cdcad317906e111d3132b441ff854c0af47..199c4b7ef3d76b29220b7fd8ab05ef909609b648 100644 (file)
@@ -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;
index 5d50b212b29464127899fe069301f7cd4c1b1995..ebee014cd98ea94a00f09814a6b5b9c1c407baf2 100644 (file)
@@ -1113,6 +1113,12 @@ void wxWindowBase::SendSizeEventToParent(int flags)
         parent->SendSizeEvent(flags);
 }
 
+bool wxWindowBase::CanScroll(int orient) const
+{
+    return (m_windowStyle &
+            (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
+}
+
 bool wxWindowBase::HasScrollbar(int orient) const
 {
     // if scrolling in the given direction is disabled, we can't have the