X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f3286d17d6f65c3acddabb45545c2ef1b0d9b20..22fb32d5071b4a234cb600e50e59f971dd78d04a:/src/generic/scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 25fcf9048a..1cef14d60f 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -40,6 +40,7 @@
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/timer.h"
+#include "wx/sizer.h"
 
 #ifdef __WXMSW__
     #include <windows.h> // for DLGC_WANTARROWS
@@ -389,10 +390,17 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
 
 void wxScrollHelper::DeleteEvtHandler()
 {
-    // FIXME: we should search for m_handler in the handler list
-    if ( m_win )
+    // search for m_handler in the handler list
+    if ( m_win && m_handler )
     {
-        m_win->PopEventHandler(TRUE /* Delete old event handler*/);
+        if ( m_win->RemoveEventHandler(m_handler) )
+        {
+            delete m_handler;
+        }
+        //else: something is very wrong, so better [maybe] leak memory than
+        //      risk a crash because of double deletion
+
+        m_handler = NULL;
     }
 }
 
@@ -415,6 +423,9 @@ void wxScrollHelper::DoSetTargetWindow(wxWindow *target)
     // which we scroll - we don't need to hijack its events)
     if ( m_targetWindow == m_win )
     {
+        // if we already have a handler, delete it first
+        DeleteEvtHandler();
+
         m_handler = new wxScrollHelperEvtHandler(this);
         m_targetWindow->PushEventHandler(m_handler);
     }
@@ -826,11 +837,6 @@ void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) cons
 // Default OnSize resets scrollbars, if any
 void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 {
-#if wxUSE_CONSTRAINTS
-    if ( m_win->GetAutoLayout() )
-        m_win->Layout();
-#endif
-
     AdjustScrollbars();
 }
 
@@ -1092,11 +1098,6 @@ bool wxGenericScrolledWindow::Create(wxWindow *parent,
 
     bool ok = wxPanel::Create(parent, id, pos, size, style, name);
 
-#ifdef __WXMSW__
-    // we need to process arrows ourselves for scrolling
-    m_lDlgCode |= DLGC_WANTARROWS;
-#endif // __WXMSW__
-
     return ok;
 }
 
@@ -1104,6 +1105,22 @@ wxGenericScrolledWindow::~wxGenericScrolledWindow()
 {
 }
 
+bool wxGenericScrolledWindow::Layout()
+{
+    if (GetSizer())
+    {
+        // Take into account the virtual size and scrolled position of the window
+        int x, y, w, h;
+        CalcScrolledPosition(0,0, &x,&y);
+        GetVirtualSize(&w, &h);
+        GetSizer()->SetDimension(x, y, w, h);
+        return TRUE;
+    }
+
+    // fall back to default for LayoutConstraints
+    return wxPanel::Layout();
+}
+
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 {
     // the user code didn't really draw the window if we got here, so set this
@@ -1113,6 +1130,25 @@ void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
     event.Skip();
 }
 
+#ifdef __WXMSW__
+long
+wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
+                                       WXWPARAM wParam,
+                                       WXLPARAM lParam)
+{
+    long rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);
+
+    // we need to process arrows ourselves for scrolling
+    if ( nMsg == WM_GETDLGCODE )
+    {
+        rc |= DLGC_WANTARROWS;
+    }
+
+    return rc;
+}
+
+#endif // __WXMSW__
+
 #if WXWIN_COMPATIBILITY
 
 void wxGenericScrolledWindow::GetScrollUnitsPerPage (int *x_page, int *y_page) const