From f9ec0ea7c502aa83ab8de3a04055fffabf47610d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Sep 2008 17:36:57 +0000 Subject: [PATCH] eliminate the hysteresis when scrollbars didn't disappear when the window was resized to be less than its virtual size and then resized back to be slightly greater than it in the native GTK version too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/scrolwin.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 860c65d559..006a4d6ca3 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -219,6 +219,18 @@ protected: int& scrollUnits, int& scrollPosition); + // this function should be overridden to return the size available for + // m_targetWindow inside m_win of the given size + // + // the default implementation is only good for m_targetWindow == m_win + // case, if we're scrolling a subwindow you must override this method + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) + { + wxASSERT_MSG( m_targetWindow == m_win, "must be overridden" ); + + return size; + } + double m_scaleX; double m_scaleY; @@ -248,18 +260,6 @@ protected: wxScrollHelperEvtHandler *m_handler; -private: - // this function should be overridden to return the size available for - // m_targetWindow inside m_win of the given size - // - // the default implementation is only good for m_targetWindow == m_win - // case, if we're scrolling a subwindow you must override this method - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) - { - wxASSERT_MSG( m_targetWindow == m_win, "must be overridden" ); - - return size; - } DECLARE_NO_COPY_CLASS(wxScrollHelper) }; -- 2.45.2