placeholder

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 683fbdfe252db6aef30ab37517d1ec0571f4b060..05e5a0c48c246675a7b7ed2d60746aab18452721 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "genscrolwin.h"
 #endif
 
     #pragma implementation "genscrolwin.h"
 #endif
 


@@ -40,8 +40,11 @@
 
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 
 #include "wx/scrolwin.h"
 #include "wx/panel.h"

+#if wxUSE_TIMER

 #include "wx/timer.h"
 #include "wx/timer.h"

+#endif

 #include "wx/sizer.h"
 #include "wx/sizer.h"

+#include "wx/recguard.h"

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


@@ -61,6 +64,11 @@
 
 IMPLEMENT_CLASS(wxScrolledWindow, wxGenericScrolledWindow)
 
 
 IMPLEMENT_CLASS(wxScrolledWindow, wxGenericScrolledWindow)
 

+/*
+       TODO PROPERTIES
+               style wxHSCROLL | wxVSCROLL
+*/
+

 // ----------------------------------------------------------------------------
 // wxScrollHelperEvtHandler: intercept the events from the window and forward
 // them to wxScrollHelper
 // ----------------------------------------------------------------------------
 // wxScrollHelperEvtHandler: intercept the events from the window and forward
 // them to wxScrollHelper


@@ -86,6 +94,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler)
 };
 
     DECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler)
 };
 

+#if wxUSE_TIMER

 // ----------------------------------------------------------------------------
 // wxAutoScrollTimer: the timer used to generate a stream of scroll events when
 // a captured mouse is held outside the window
 // ----------------------------------------------------------------------------
 // wxAutoScrollTimer: the timer used to generate a stream of scroll events when
 // a captured mouse is held outside the window


@@ -170,6 +179,7 @@ void wxAutoScrollTimer::Notify()
         }
     }
 }
         }
     }
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // wxScrollHelperEvtHandler
 
 // ----------------------------------------------------------------------------
 // wxScrollHelperEvtHandler


@@ -358,17 +368,23 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
     m_targetWindow->SetVirtualSize( w, h );
 
     if (do_refresh && !noRefresh)
     m_targetWindow->SetVirtualSize( w, h );
 
     if (do_refresh && !noRefresh)

-        m_targetWindow->Refresh(TRUE, GetRect());
-
-    // TODO: check if we can use AdjustScrollbars always.
-#ifdef __WXUNIVERSAL__
-    AdjustScrollbars();
-#else    
-    // This is also done by AdjustScrollbars, above
-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately() ;
-#endif
-#endif
+        m_targetWindow->Refresh(TRUE, GetScrollRect());
+
+#ifndef __WXUNIVERSAL__
+    // If the target is not the same as the window with the scrollbars,
+    // then we need to update the scrollbars here, since they won't have
+    // been updated by SetVirtualSize().
+    if ( m_targetWindow != m_win )
+#endif // !__WXUNIVERSAL__
+    {
+        AdjustScrollbars();
+    }
+#ifndef __WXUNIVERSAL__
+    else
+    {
+        // otherwise this has been done by AdjustScrollbars, above
+    }
+#endif // !__WXUNIVERSAL__

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -488,16 +504,12 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
 
     if ( needsRefresh )
     {
 
     if ( needsRefresh )
     {

-        m_targetWindow->Refresh(TRUE, GetRect());
+        m_targetWindow->Refresh(TRUE, GetScrollRect());

     }
     else
     {
     }
     else
     {

-        m_targetWindow->ScrollWindow(dx, dy, GetRect());
+        m_targetWindow->ScrollWindow(dx, dy, GetScrollRect());

     }
     }

-
-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately() ;
-#endif

 }
 
 int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
 }
 
 int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)


@@ -569,27 +581,32 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
                 nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
         }
         else
                 nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
         }
         else

-            m_targetWindow->Refresh(TRUE, GetRect());
+            m_targetWindow->Refresh(TRUE, GetScrollRect());

     }
     else
     {
     }
     else
     {

-        if (m_yScrollPixelsPerLine > 0)
+        if ( m_yScrollPixelsPerLine > 0 )

         {
         {

-            int w, h;
-            GetTargetSize(&w, &h);
-
-            int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
-            int noPositions = (int) ( ((nMaxHeight - h)/(double)m_yScrollPixelsPerLine) + 0.5 );
-            if (noPositions < 0)
-                noPositions = 0;
-
-            if ( (m_yScrollPosition + nScrollInc) < 0 )
-                nScrollInc = -m_yScrollPosition; // As -ve as we can go
-            else if ( (m_yScrollPosition + nScrollInc) > noPositions )
-                nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
+            if ( m_yScrollPosition + nScrollInc < 0 )
+            {
+                // As -ve as we can go
+                nScrollInc = -m_yScrollPosition;
+            }
+            else // check for the other bound
+            {
+                const int posMax = m_yScrollLines - m_yScrollLinesPerPage;
+                if ( m_yScrollPosition + nScrollInc > posMax )
+                {
+                    // As +ve as we can go
+                    nScrollInc = posMax - m_yScrollPosition;
+                }
+            }

         }
         else
         }
         else

-            m_targetWindow->Refresh(TRUE, GetRect());
+        {
+            // VZ: why do we do this? (FIXME)
+            m_targetWindow->Refresh(TRUE, GetScrollRect());
+        }

     }
 
     return nScrollInc;
     }
 
     return nScrollInc;


@@ -598,9 +615,18 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
 // Adjust the scrollbars - new version.
 void wxScrollHelper::AdjustScrollbars()
 {
 // Adjust the scrollbars - new version.
 void wxScrollHelper::AdjustScrollbars()
 {

-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately();
-#endif
+    static wxRecursionGuardFlag s_flagReentrancy;
+    wxRecursionGuard guard(s_flagReentrancy);
+    if ( guard.IsInside() )
+    {
+        // don't reenter AdjustScrollbars() while another call to
+        // AdjustScrollbars() is in progress because this may lead to calling
+        // ScrollWindow() twice and this can really happen under MSW if
+        // SetScrollbar() call below adds or removes the scrollbar which
+        // changes the window size and hence results in another
+        // AdjustScrollbars() call
+        return;
+    }

 
     int w = 0, h = 0;
     int oldw, oldh;
 
     int w = 0, h = 0;
     int oldw, oldh;


@@ -608,7 +634,14 @@ void wxScrollHelper::AdjustScrollbars()
     int oldXScroll = m_xScrollPosition;
     int oldYScroll = m_yScrollPosition;
 
     int oldXScroll = m_xScrollPosition;
     int oldYScroll = m_yScrollPosition;
 

-    do {
+    // VZ: at least under Windows this loop is useless because when scrollbars
+    //     [dis]appear we get a WM_SIZE resulting in another call to
+    //     AdjustScrollbars() anyhow. As it doesn't seem to do any harm I leave
+    //     it here for now but it would be better to ensure that all ports
+    //     generate EVT_SIZE when scrollbars [dis]appear, emulating it if
+    //     necessary, and remove it later
+    do
+    {

         GetTargetSize(&w, 0);
 
         if (m_xScrollPixelsPerLine == 0)
         GetTargetSize(&w, 0);
 
         if (m_xScrollPixelsPerLine == 0)


@@ -640,40 +673,59 @@ void wxScrollHelper::AdjustScrollbars()
 
         GetTargetSize(0, &h);
 
 
         GetTargetSize(0, &h);
 

-        if (m_yScrollPixelsPerLine == 0)
+        // scroll lines per page: if 0, no scrolling is needed
+        int linesPerPage;
+
+        if ( m_yScrollPixelsPerLine == 0 )

         {
         {

+            // scrolling is disabled

             m_yScrollLines = 0;
             m_yScrollPosition = 0;
             m_yScrollLines = 0;
             m_yScrollPosition = 0;

-            m_win->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);
+            linesPerPage = 0;

         }
         }

-        else
+        else // might need scrolling

         {
         {

-            m_yScrollLines = m_targetWindow->GetVirtualSize().GetHeight() / m_yScrollPixelsPerLine;
+            int hVirt = m_targetWindow->GetVirtualSize().GetHeight();
+            m_yScrollLines = hVirt / m_yScrollPixelsPerLine;

 
             // Calculate page size i.e. number of scroll units you get on the
             // current client window
 
             // 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;
+            linesPerPage = h / m_yScrollPixelsPerLine;
+            if ( linesPerPage >= m_yScrollLines )
+            {
+                // we're big enough to not need scrolling
+                linesPerPage =
+                m_yScrollLines =
+                m_yScrollPosition = 0;
+            }
+            else // we do need a scrollbar
+            {
+                if ( linesPerPage < 1 )
+                    linesPerPage = 1;
+
+                // Correct position if greater than extent of canvas minus
+                // the visible portion of it or if below zero
+                const int posMax = m_yScrollLines - linesPerPage;
+                if ( m_yScrollPosition > posMax )
+                    m_yScrollPosition = posMax;
+                else if ( m_yScrollPosition < 0 )
+                    m_yScrollPosition = 0;
+            }
+        }

 
 

-            // 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,
+                            linesPerPage, m_yScrollLines);

 
 

-            m_win->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
-            // The amount by which we scroll when paging
-            SetScrollPageSize(wxVERTICAL, noPagePositions);
-        }
+        // The amount by which we scroll when paging
+        SetScrollPageSize(wxVERTICAL, linesPerPage);

 
 

-        // If a scrollbar (dis)appeared as a result of this, adjust them again.

 
 

+        // If a scrollbar (dis)appeared as a result of this, adjust them again.

         oldw = w;
         oldh = h;
 
         GetTargetSize( &w, &h );
         oldw = w;
         oldh = h;
 
         GetTargetSize( &w, &h );

-    } while ( w != oldw && h != oldh );
+    } while ( w != oldw || h != oldh );

 
 #ifdef __WXMOTIF__
     // Sorry, some Motif-specific code to implement a backing pixmap
 
 #ifdef __WXMOTIF__
     // Sorry, some Motif-specific code to implement a backing pixmap


@@ -712,23 +764,19 @@ void wxScrollHelper::AdjustScrollbars()
     {
        if (m_xScrollingEnabled)
             m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0,
     {
        if (m_xScrollingEnabled)
             m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0,

-                                          GetRect() );
+                                          GetScrollRect() );

        else
        else

-            m_targetWindow->Refresh(TRUE, GetRect());
+            m_targetWindow->Refresh(TRUE, GetScrollRect());

     }
 
     if (oldYScroll != m_yScrollPosition)
     {
         if (m_yScrollingEnabled)
             m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition),
     }
 
     if (oldYScroll != m_yScrollPosition)
     {
         if (m_yScrollingEnabled)
             m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition),

-                                          GetRect() );
+                                          GetScrollRect() );

         else
         else

-            m_targetWindow->Refresh(TRUE, GetRect());
+            m_targetWindow->Refresh(TRUE, GetScrollRect());

     }
     }

-
-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately();
-#endif

 }
 
 void wxScrollHelper::DoPrepareDC(wxDC& dc)
 }
 
 void wxScrollHelper::DoPrepareDC(wxDC& dc)


@@ -792,10 +840,6 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
     if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
         ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
 
     if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
         ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
 

-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately();
-#endif
-

     int w, h;
     GetTargetSize(&w, &h);
 
     int w, h;
     GetTargetSize(&w, &h);
 


@@ -817,7 +861,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
         if (old_x != m_xScrollPosition) {
             m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
             m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0,
         if (old_x != m_xScrollPosition) {
             m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
             m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0,

-                                          GetRect() );
+                                          GetScrollRect() );

         }
     }
     if ((y_pos != -1) && (m_yScrollPixelsPerLine))
         }
     }
     if ((y_pos != -1) && (m_yScrollPixelsPerLine))


@@ -838,14 +882,9 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
         if (old_y != m_yScrollPosition) {
             m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition );
             m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine,
         if (old_y != m_yScrollPosition) {
             m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition );
             m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine,

-                                          GetRect() );
+                                          GetScrollRect() );

         }
     }
         }
     }

-
-#ifdef __WXMAC__
-    m_targetWindow->MacUpdateImmediately();
-#endif
-

 }
 
 void wxScrollHelper::EnableScrolling (bool x_scroll, bool y_scroll)
 }
 
 void wxScrollHelper::EnableScrolling (bool x_scroll, bool y_scroll)


@@ -1027,11 +1066,13 @@ bool wxScrollHelper::SendAutoScrollEvents(wxScrollWinEvent& event) const
 
 void wxScrollHelper::StopAutoScrolling()
 {
 
 void wxScrollHelper::StopAutoScrolling()
 {

+#if wxUSE_TIMER

     if ( m_timerAutoScroll )
     {
         delete m_timerAutoScroll;
         m_timerAutoScroll = (wxTimer *)NULL;
     }
     if ( m_timerAutoScroll )
     {
         delete m_timerAutoScroll;
         m_timerAutoScroll = (wxTimer *)NULL;
     }

+#endif

 }
 
 void wxScrollHelper::HandleOnMouseEnter(wxMouseEvent& event)
 }
 
 void wxScrollHelper::HandleOnMouseEnter(wxMouseEvent& event)


@@ -1093,6 +1134,7 @@ void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
         if ( !m_targetWindow->HasScrollbar(orient) )
             return;
 
         if ( !m_targetWindow->HasScrollbar(orient) )
             return;
 

+#if wxUSE_TIMER

         delete m_timerAutoScroll;
         m_timerAutoScroll = new wxAutoScrollTimer
                                 (
         delete m_timerAutoScroll;
         m_timerAutoScroll = new wxAutoScrollTimer
                                 (


@@ -1103,6 +1145,7 @@ void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable

+#endif

     }
 }
 
     }
 }
 


@@ -1200,10 +1243,8 @@ void wxGenericScrolledWindow::DoSetVirtualSize(int x, int y)
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

-#endif

 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)


@@ -1216,42 +1257,26 @@ void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 }
 
 #ifdef __WXMSW__
 }
 
 #ifdef __WXMSW__

-long
+WXLRESULT

 wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
                                        WXWPARAM wParam,
                                        WXLPARAM lParam)
 {
 wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
                                        WXWPARAM wParam,
                                        WXLPARAM lParam)
 {

-    long rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);
+    WXLRESULT rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);

 
 

+#ifndef __WXWINCE__

     // we need to process arrows ourselves for scrolling
     if ( nMsg == WM_GETDLGCODE )
     {
         rc |= DLGC_WANTARROWS;
     }
     // we need to process arrows ourselves for scrolling
     if ( nMsg == WM_GETDLGCODE )
     {
         rc |= DLGC_WANTARROWS;
     }

+#endif

 
     return rc;
 }
 
 #endif // __WXMSW__
 
 
     return rc;
 }
 
 #endif // __WXMSW__
 

-#if WXWIN_COMPATIBILITY
-
-void wxGenericScrolledWindow::GetScrollUnitsPerPage (int *x_page, int *y_page) const
-{
-      *x_page = GetScrollPageSize(wxHORIZONTAL);
-      *y_page = GetScrollPageSize(wxVERTICAL);
-}
-
-void wxGenericScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
-{
-    if ( xx )
-        *xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
-    if ( yy )
-        *yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
-}
-
-#endif // WXWIN_COMPATIBILITY
-

 #endif // !wxGTK
 
 // vi:sts=4:sw=4:et
 #endif // !wxGTK
 
 // vi:sts=4:sw=4:et