From 9a268018748c6efb9f51254fb987c119afd71bdd Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 14 Jul 2001 18:11:52 +0000 Subject: [PATCH] Corrected wxScrolledWindow's OnSize behaviour. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/scrlwing.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index ff58945bf8..862172c559 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -167,15 +167,21 @@ void wxAutoScrollTimer::Notify() bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event) { + wxEventType evType = event.GetEventType(); + + if ( evType == wxEVT_SIZE ) // Don't let wxPanel catch the size events. RR. + { + m_scrollHelper->HandleOnSize((wxSizeEvent &)event); + return TRUE; + } + if ( wxEvtHandler::ProcessEvent(event) ) return TRUE; - + // reset the skipped flag to FALSE as it might have been set to TRUE in // ProcessEvent() above event.Skip(FALSE); - wxEventType evType = event.GetEventType(); - if ( evType == wxEVT_PAINT ) { m_scrollHelper->HandleOnPaint((wxPaintEvent &)event); @@ -209,10 +215,6 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event) m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event); } #endif // wxUSE_MOUSEWHEEL - else if ( evType == wxEVT_SIZE ) - { - m_scrollHelper->HandleOnSize((wxSizeEvent &)event); - } else if ( evType == wxEVT_CHAR ) { m_scrollHelper->HandleOnChar((wxKeyEvent &)event); -- 2.45.2