fix crash when the user code refuses to validate the new text when editing the item...

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 25fcf9048a52f4fb7ee3a10952accc0138f2b2b9..b36eace80ec1ca21002549d6ea46a30959cdaaf2 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -2,7 +2,8 @@
 // Name:        generic/scrolwin.cpp
 // Purpose:     wxGenericScrolledWindow implementation
 // Author:      Julian Smart
 // Name:        generic/scrolwin.cpp
 // Purpose:     wxGenericScrolledWindow implementation
 // Author:      Julian Smart

-// Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement
+// Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement.
+//              Ron Lee on 10.4.02:  virtual size / auto scrollbars et al.

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team


@@ -40,6 +41,7 @@
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/timer.h"
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/timer.h"

+#include "wx/sizer.h"

 
 #ifdef __WXMSW__
     #include <windows.h> // for DLGC_WANTARROWS
 
 #ifdef __WXMSW__
     #include <windows.h> // for DLGC_WANTARROWS


@@ -325,10 +327,10 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
     bool do_refresh =
     (
       (noUnitsX != 0 && m_xScrollLines == 0) ||
     bool do_refresh =
     (
       (noUnitsX != 0 && m_xScrollLines == 0) ||

-      (noUnitsX < m_xScrollLines && xpos > pixelsPerUnitX*noUnitsX) ||
+      (noUnitsX < m_xScrollLines && xpos > pixelsPerUnitX * noUnitsX) ||

 
       (noUnitsY != 0 && m_yScrollLines == 0) ||
 
       (noUnitsY != 0 && m_yScrollLines == 0) ||

-      (noUnitsY < m_yScrollLines && ypos > pixelsPerUnitY*noUnitsY) ||
+      (noUnitsY < m_yScrollLines && ypos > pixelsPerUnitY * noUnitsY) ||

       (xPos != m_xScrollPosition) ||
       (yPos != m_yScrollPosition)
     );
       (xPos != m_xScrollPosition) ||
       (yPos != m_yScrollPosition)
     );


@@ -337,41 +339,8 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
     m_yScrollPixelsPerLine = pixelsPerUnitY;
     m_xScrollPosition = xPos;
     m_yScrollPosition = yPos;
     m_yScrollPixelsPerLine = pixelsPerUnitY;
     m_xScrollPosition = xPos;
     m_yScrollPosition = yPos;

-    m_xScrollLines = noUnitsX;
-    m_yScrollLines = noUnitsY;

 
 

-#ifdef __WXMOTIF__
-    // Sorry, some Motif-specific code to implement a backing pixmap
-    // for the wxRETAINED style. Implementing a backing store can't
-    // be entirely generic because it relies on the wxWindowDC implementation
-    // to duplicate X drawing calls for the backing pixmap.
-
-    if ( m_targetWindow->GetWindowStyle() & wxRETAINED )
-    {
-        Display* dpy = XtDisplay((Widget)m_targetWindow->GetMainWidget());
-
-        int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine;
-        int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine;
-        if (m_targetWindow->GetBackingPixmap() &&
-           !((m_targetWindow->GetPixmapWidth() == totalPixelWidth) &&
-             (m_targetWindow->GetPixmapHeight() == totalPixelHeight)))
-        {
-            XFreePixmap (dpy, (Pixmap) m_targetWindow->GetBackingPixmap());
-            m_targetWindow->SetBackingPixmap((WXPixmap) 0);
-        }
-
-        if (!m_targetWindow->GetBackingPixmap() &&
-           (noUnitsX != 0) && (noUnitsY != 0))
-        {
-            int depth = wxDisplayDepth();
-            m_targetWindow->SetPixmapWidth(totalPixelWidth);
-            m_targetWindow->SetPixmapHeight(totalPixelHeight);
-            m_targetWindow->SetBackingPixmap((WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
-              m_targetWindow->GetPixmapWidth(), m_targetWindow->GetPixmapHeight(), depth));
-        }
-
-    }
-#endif // Motif
+    m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );

 
     AdjustScrollbars();
 
 
     AdjustScrollbars();
 


@@ -389,10 +358,17 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
 
 void wxScrollHelper::DeleteEvtHandler()
 {
 
 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 +391,9 @@ void wxScrollHelper::DoSetTargetWindow(wxWindow *target)
     // which we scroll - we don't need to hijack its events)
     if ( m_targetWindow == m_win )
     {
     // 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);
     }
         m_handler = new wxScrollHelperEvtHandler(this);
         m_targetWindow->PushEventHandler(m_handler);
     }


@@ -604,64 +583,116 @@ void wxScrollHelper::AdjustScrollbars()
     m_targetWindow->MacUpdateImmediately();
 #endif
 
     m_targetWindow->MacUpdateImmediately();
 #endif
 

-    int w, h;
-    GetTargetSize(&w, &h);
+    int w = 0, h = 0;
+    int oldw, oldh;

 
     int oldXScroll = m_xScrollPosition;
     int oldYScroll = m_yScrollPosition;
 
 
     int oldXScroll = m_xScrollPosition;
     int oldYScroll = m_yScrollPosition;
 

-    if (m_xScrollLines > 0)
-    {
-        // Calculate page size i.e. number of scroll units you get on the
-        // current client window
-        int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
-        if (noPagePositions < 1) noPagePositions = 1;
-        if ( noPagePositions > m_xScrollLines )
-            noPagePositions = m_xScrollLines;
+    do {
+        GetTargetSize(&w, 0);

 
 

-        // Correct position if greater than extent of canvas minus
-        // the visible portion of it or if below zero
-        m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition);
-        m_xScrollPosition = wxMax( 0, m_xScrollPosition );
+        if (m_xScrollPixelsPerLine == 0)
+        {
+            m_xScrollLines = 0;
+            m_xScrollPosition = 0;
+            m_win->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE);
+        }
+        else
+        {
+            m_xScrollLines = m_targetWindow->GetVirtualSize().GetWidth() / m_xScrollPixelsPerLine;
+
+            // Calculate page size i.e. number of scroll units you get on the
+            // current client window
+            int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
+            if (noPagePositions < 1) noPagePositions = 1;
+            if ( noPagePositions > m_xScrollLines )
+                noPagePositions = m_xScrollLines;
+
+            // Correct position if greater than extent of canvas minus
+            // the visible portion of it or if below zero
+            m_xScrollPosition = wxMin( m_xScrollLines - noPagePositions, m_xScrollPosition);
+            m_xScrollPosition = wxMax( 0, m_xScrollPosition );
+
+            m_win->SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
+            // The amount by which we scroll when paging
+            SetScrollPageSize(wxHORIZONTAL, noPagePositions);
+        }

 
 

-        m_win->SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
-        // The amount by which we scroll when paging
-        SetScrollPageSize(wxHORIZONTAL, noPagePositions);
-    }
-    else
-    {
-        m_xScrollPosition = 0;
-        m_win->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE);
-    }
+        GetTargetSize(0, &h);

 
 

-    if (m_yScrollLines > 0)
-    {
-        // Calculate page size i.e. number of scroll units you get on the
-        // current client window
-        int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
-        if (noPagePositions < 1) noPagePositions = 1;
-        if ( noPagePositions > m_yScrollLines )
-            noPagePositions = m_yScrollLines;
+        if (m_yScrollPixelsPerLine == 0)
+        {
+            m_yScrollLines = 0;
+            m_yScrollPosition = 0;
+            m_win->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);
+        }
+        else
+        {
+            m_yScrollLines = m_targetWindow->GetVirtualSize().GetHeight() / m_yScrollPixelsPerLine;
+
+            // Calculate page size i.e. number of scroll units you get on the
+            // current client window
+            int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
+            if (noPagePositions < 1) noPagePositions = 1;
+            if ( noPagePositions > m_yScrollLines )
+                noPagePositions = m_yScrollLines;
+
+            // Correct position if greater than extent of canvas minus
+            // the visible portion of it or if below zero
+            m_yScrollPosition = wxMin( m_yScrollLines - noPagePositions, m_yScrollPosition );
+            m_yScrollPosition = wxMax( 0, m_yScrollPosition );
+
+            m_win->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
+            // The amount by which we scroll when paging
+            SetScrollPageSize(wxVERTICAL, noPagePositions);
+        }

 
 

-        // Correct position if greater than extent of canvas minus
-        // the visible portion of it or if below zero
-        m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
-        m_yScrollPosition = wxMax( 0, m_yScrollPosition );
+        // If a scrollbar (dis)appeared as a result of this, adjust them again.

 
 

-        m_win->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
-        // The amount by which we scroll when paging
-        SetScrollPageSize(wxVERTICAL, noPagePositions);
-    }
-    else
+        oldw = w;
+        oldh = h;
+
+        GetTargetSize( &w, &h );
+    } while ( w != oldw && h != oldh );
+
+#ifdef __WXMOTIF__
+    // Sorry, some Motif-specific code to implement a backing pixmap
+    // for the wxRETAINED style. Implementing a backing store can't
+    // be entirely generic because it relies on the wxWindowDC implementation
+    // to duplicate X drawing calls for the backing pixmap.
+
+    if ( m_targetWindow->GetWindowStyle() & wxRETAINED )

     {
     {

-        m_yScrollPosition = 0;
-        m_win->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);
+        Display* dpy = XtDisplay((Widget)m_targetWindow->GetMainWidget());
+
+        int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine;
+        int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine;
+        if (m_targetWindow->GetBackingPixmap() &&
+           !((m_targetWindow->GetPixmapWidth() == totalPixelWidth) &&
+             (m_targetWindow->GetPixmapHeight() == totalPixelHeight)))
+        {
+            XFreePixmap (dpy, (Pixmap) m_targetWindow->GetBackingPixmap());
+            m_targetWindow->SetBackingPixmap((WXPixmap) 0);
+        }
+
+        if (!m_targetWindow->GetBackingPixmap() &&
+           (m_xScrollLines != 0) && (m_yScrollLines != 0))
+        {
+            int depth = wxDisplayDepth();
+            m_targetWindow->SetPixmapWidth(totalPixelWidth);
+            m_targetWindow->SetPixmapHeight(totalPixelHeight);
+            m_targetWindow->SetBackingPixmap((WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
+              m_targetWindow->GetPixmapWidth(), m_targetWindow->GetPixmapHeight(), depth));
+        }
+

     }
     }

+#endif // Motif

 
     if (oldXScroll != m_xScrollPosition)
     {
        if (m_xScrollingEnabled)
 
     if (oldXScroll != m_xScrollPosition)
     {
        if (m_xScrollingEnabled)

-            m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll-m_xScrollPosition), 0,
+            m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0,

                                           GetRect() );
        else
             m_targetWindow->Refresh(TRUE, GetRect());
                                           GetRect() );
        else
             m_targetWindow->Refresh(TRUE, GetRect());


@@ -689,6 +720,24 @@ void wxScrollHelper::DoPrepareDC(wxDC& dc)
     dc.SetUserScale( m_scaleX, m_scaleY );
 }
 
     dc.SetUserScale( m_scaleX, m_scaleY );
 }
 

+void wxScrollHelper::SetScrollRate( int xstep, int ystep )
+{
+    int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
+    int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
+
+    m_xScrollPixelsPerLine = xstep;
+    m_yScrollPixelsPerLine = ystep;
+
+    int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
+    int new_y = m_yScrollPixelsPerLine * m_yScrollPosition;
+
+    m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
+    m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition );
+    m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y );
+
+    AdjustScrollbars();
+}
+

 void wxScrollHelper::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
 {
     if ( x_unit )
 void wxScrollHelper::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
 {
     if ( x_unit )


@@ -786,14 +835,6 @@ void wxScrollHelper::EnableScrolling (bool x_scroll, bool y_scroll)
     m_yScrollingEnabled = y_scroll;
 }
 
     m_yScrollingEnabled = y_scroll;
 }
 

-void wxScrollHelper::GetVirtualSize (int *x, int *y) const
-{
-    if ( x )
-        *x = m_xScrollPixelsPerLine * m_xScrollLines;
-    if ( y )
-        *y = m_yScrollPixelsPerLine * m_yScrollLines;
-}
-

 // Where the current view starts from
 void wxScrollHelper::GetViewStart (int *x, int *y) const
 {
 // Where the current view starts from
 void wxScrollHelper::GetViewStart (int *x, int *y) const
 {


@@ -803,7 +844,7 @@ void wxScrollHelper::GetViewStart (int *x, int *y) const
         *y = m_yScrollPosition;
 }
 
         *y = m_yScrollPosition;
 }
 

-void wxScrollHelper::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const

 {
     if ( xx )
         *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
 {
     if ( xx )
         *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;


@@ -811,7 +852,7 @@ void wxScrollHelper::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
         *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
 }
 
         *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
 }
 

-void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrollHelper::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const

 {
     if ( xx )
         *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
 {
     if ( xx )
         *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;


@@ -826,12 +867,17 @@ void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) cons
 // Default OnSize resets scrollbars, if any
 void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 {
 // Default OnSize resets scrollbars, if any
 void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 {

+    if ( m_targetWindow != m_win )
+        m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
+
+    m_win->SetVirtualSize( m_win->GetClientSize() );
+
+    AdjustScrollbars();
+

 #if wxUSE_CONSTRAINTS
 #if wxUSE_CONSTRAINTS

-    if ( m_win->GetAutoLayout() )
+    if (m_win->GetAutoLayout())

         m_win->Layout();
 #endif
         m_win->Layout();
 #endif

-
-    AdjustScrollbars();

 }
 
 // This calls OnDraw, having adjusted the origin according to the current
 }
 
 // This calls OnDraw, having adjusted the origin according to the current


@@ -857,7 +903,7 @@ void wxScrollHelper::HandleOnChar(wxKeyEvent& event)
 
     GetViewStart(&stx, &sty);
     GetTargetSize(&clix, &cliy);
 
     GetViewStart(&stx, &sty);
     GetTargetSize(&clix, &cliy);

-    GetVirtualSize(&szx, &szy);
+    m_targetWindow->GetVirtualSize(&szx, &szy);

 
     if( m_xScrollPixelsPerLine )
     {
 
     if( m_xScrollPixelsPerLine )
     {


@@ -1092,11 +1138,6 @@ bool wxGenericScrolledWindow::Create(wxWindow *parent,
 
     bool ok = wxPanel::Create(parent, id, pos, size, style, name);
 
 
     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;
 }
 
     return ok;
 }
 


@@ -1104,6 +1145,24 @@ wxGenericScrolledWindow::~wxGenericScrolledWindow()
 {
 }
 
 {
 }
 

+bool wxGenericScrolledWindow::Layout()
+{
+    if (GetSizer() && m_targetWindow == this)
+    {
+        // If we're the scroll target, 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
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 {
     // the user code didn't really draw the window if we got here, so set this


@@ -1113,6 +1172,25 @@ void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
     event.Skip();
 }
 
     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
 #if WXWIN_COMPATIBILITY
 
 void wxGenericScrolledWindow::GetScrollUnitsPerPage (int *x_page, int *y_page) const


@@ -1133,3 +1211,4 @@ void wxGenericScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, fl
 
 #endif // !wxGTK
 
 
 #endif // !wxGTK
 

+// vi:sts=4:sw=4:et