Corrected wxScrolledWindow's OnSize behaviour.

[wxWidgets.git] / src / generic / scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index ff58945bf8739f836677de4049cdd0eaa2ad474a..862172c5593fa50f5244af4a0533a133fb9b7820 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -167,15 +167,21 @@ void wxAutoScrollTimer::Notify()
 
 bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
 {
 
 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;
     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);
 
     // 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);
     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
         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);
     else if ( evType == wxEVT_CHAR )
     {
         m_scrollHelper->HandleOnChar((wxKeyEvent &)event);