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

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-08-27 13:12:31 +00:00
parent 8f96683438
commit 3d777efedc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/window.h
View File

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

6
src/common/wincmn.cpp
View File

@@ -1113,6 +1113,12 @@ void wxWindowBase::SendSizeEventToParent(int flags)
parent->SendSizeEvent(flags); parent->SendSizeEvent(flags);
} }
bool wxWindowBase::CanScroll(int orient) const
{
return (m_windowStyle &
(orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
}
bool wxWindowBase::HasScrollbar(int orient) const bool wxWindowBase::HasScrollbar(int orient) const
{ {
// if scrolling in the given direction is disabled, we can't have the // if scrolling in the given direction is disabled, we can't have the