X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/generic/scrolwin.cpp

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 3e5e67a5b5..56eaf96415 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -20,38 +20,46 @@
 #include "wx/utils.h"
 #include "wx/dcclient.h"
 
-#ifdef __WXMSW__
-#include "windows.h"
-#endif
-
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #include "wx/generic/scrolwin.h"
+#include "wx/panel.h"
 
 #if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)
-  EVT_SCROLL(wxScrolledWindow::OnScroll)
-  EVT_SIZE(wxScrolledWindow::OnSize)
-  EVT_PAINT(wxScrolledWindow::OnPaint)
+BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
+    EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
+    EVT_SIZE(wxScrolledWindow::OnSize)
+    EVT_PAINT(wxScrolledWindow::OnPaint)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
+#endif
+
+#ifdef __WXMSW__
+#include "windows.h"
+#endif
+
+#ifdef __WXMOTIF__
+// For wxRETAINED implementation
+#include <Xm/Xm.h>
 #endif
 
-wxScrolledWindow::wxScrolledWindow(void)
+wxScrolledWindow::wxScrolledWindow()
 {
-  m_xScrollPixelsPerLine = 0;
-  m_yScrollPixelsPerLine = 0;
-  m_xScrollingEnabled = TRUE;
-  m_yScrollingEnabled = TRUE;
-  m_xScrollPosition = 0;
-  m_yScrollPosition = 0;
-  m_xScrollLines = 0;
-  m_yScrollLines = 0;
-  m_xScrollLinesPerPage = 0;
-  m_yScrollLinesPerPage = 0;
+    m_xScrollPixelsPerLine = 0;
+    m_yScrollPixelsPerLine = 0;
+    m_xScrollingEnabled = TRUE;
+    m_yScrollingEnabled = TRUE;
+    m_xScrollPosition = 0;
+    m_yScrollPosition = 0;
+    m_xScrollLines = 0;
+    m_yScrollLines = 0;
+    m_xScrollLinesPerPage = 0;
+    m_yScrollLinesPerPage = 0;
+    m_scaleX = 1.0;
+    m_scaleY = 1.0;
 }
 
 bool wxScrolledWindow::Create(wxWindow *parent, wxWindowID id,
@@ -60,18 +68,22 @@ bool wxScrolledWindow::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-  m_xScrollPixelsPerLine = 0;
-  m_yScrollPixelsPerLine = 0;
-  m_xScrollingEnabled = TRUE;
-  m_yScrollingEnabled = TRUE;
-  m_xScrollPosition = 0;
-  m_yScrollPosition = 0;
-  m_xScrollLines = 0;
-  m_yScrollLines = 0;
-  m_xScrollLinesPerPage = 0;
-  m_yScrollLinesPerPage = 0;
-
-  return wxWindow::Create(parent, id, pos, size, style, name);
+    m_xScrollPixelsPerLine = 0;
+    m_yScrollPixelsPerLine = 0;
+    m_xScrollingEnabled = TRUE;
+    m_yScrollingEnabled = TRUE;
+    m_xScrollPosition = 0;
+    m_yScrollPosition = 0;
+    m_xScrollLines = 0;
+    m_yScrollLines = 0;
+    m_xScrollLinesPerPage = 0;
+    m_yScrollLinesPerPage = 0;
+    m_scaleX = 1.0;
+    m_scaleY = 1.0;
+    
+    m_targetWindow = this;
+
+    return wxPanel::Create(parent, id, pos, size, style, name);
 }
 
 /*
@@ -82,276 +94,338 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
 	       int noUnitsX, int noUnitsY,
 	       int xPos, int yPos, bool noRefresh )
 {
-  bool do_refresh =
-     (
+    bool do_refresh =
+    (
       (noUnitsX != 0 && m_xScrollLines == 0) ||
-      (noUnitsX < m_xScrollPosition) ||
+      (noUnitsX < m_xScrollLines) ||
       (noUnitsY != 0 && m_yScrollLines == 0) ||
-      (noUnitsY < m_yScrollPosition) ||
+      (noUnitsY < m_yScrollLines) ||
       (xPos != m_xScrollPosition) ||
       (yPos != m_yScrollPosition) ||
       (pixelsPerUnitX != m_xScrollPixelsPerLine) ||
       (pixelsPerUnitY != m_yScrollPixelsPerLine)
-     );
+    );
       
-      m_xScrollPixelsPerLine = pixelsPerUnitX;
-      m_yScrollPixelsPerLine = pixelsPerUnitY;
-      m_xScrollPosition = xPos;
-      m_yScrollPosition = yPos;
-      m_xScrollLines = noUnitsX;
-      m_yScrollLines = noUnitsY;
+    m_xScrollPixelsPerLine = pixelsPerUnitX;
+    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_windowStyle & wxRETAINED) == wxRETAINED)
+    {
+        Display* dpy = XtDisplay((Widget) GetMainWidget());
+
+        int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine;
+        int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine;
+        if (m_backingPixmap &&
+           !((m_pixmapWidth == totalPixelWidth) &&
+             (m_pixmapHeight == totalPixelHeight)))
+        {
+            XFreePixmap (dpy, (Pixmap) m_backingPixmap);
+            m_backingPixmap = (WXPixmap) 0;
+        }
+
+        if (!m_backingPixmap &&
+           (noUnitsX != 0) && (noUnitsY != 0))
+        {
+            int depth = wxDisplayDepth();
+            m_pixmapWidth = totalPixelWidth;
+            m_pixmapHeight = totalPixelHeight;
+            m_backingPixmap = (WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
+            m_pixmapWidth, m_pixmapHeight, depth);
+	}
+
+    }
+#endif
       
-   AdjustScrollbars();
+    AdjustScrollbars();
    
-   if (do_refresh && !noRefresh) Refresh();
+    if (do_refresh && !noRefresh) 
+	m_targetWindow->Refresh(); 
    
 #ifdef __WXMSW__
-    UpdateWindow ((HWND) GetHWND());
+   // Necessary?
+    UpdateWindow ((HWND) m_targetWindow->GetHWND());
+#endif
+#ifdef __WXMAC__
+		m_targetWindow->MacUpdateImmediately() ;
 #endif
 }
 
-void wxScrolledWindow::OnScroll(wxScrollEvent& event)
+wxScrolledWindow::~wxScrolledWindow()
 {
-  int orient = event.GetOrientation();
-
-  int nScrollInc = CalcScrollInc(event);
-  if (nScrollInc == 0)
-    return;
-
-    // TODO: should we store the scroll position here as well as in wxWindow?
-  if (orient == wxHORIZONTAL)
-  {
-    int newPos = m_xScrollPosition + nScrollInc;
-    SetScrollPos(wxHORIZONTAL, newPos, TRUE );
-  }
-  else
-  {
-    int newPos = m_yScrollPosition + nScrollInc;
-    SetScrollPos(wxVERTICAL, newPos, TRUE );
-  }
-
-/*
-  // TODO We need to multiply the ScrollWindow amount by the scaling
-  // factor, but how do we know what this is in wxWin 2.0???
-  float scaleX = 1.0;
-  float scaleY = 1.0;
-
-  if ( this->IsKindOf(CLASSINFO(wxCanvas)) )
-  {
-    wxDC* dc = ((wxCanvas *)this)->GetDC();
-    dc->GetUserScale(&scaleX, &scaleY);
-  }
-*/
+}
 
-  if (orient == wxHORIZONTAL)
-  {
-    m_xScrollPosition += nScrollInc;
-  }
-  else
-  {
-    m_yScrollPosition += nScrollInc;
-  }
-  
-  if (orient == wxHORIZONTAL)
-  {
-    if (m_xScrollingEnabled)
-      ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
-    else
-      Refresh();
-  }
-  else
-  {
-    if (m_yScrollingEnabled)
-      ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
-    else
-      Refresh();
-  }
+void wxScrolledWindow::SetTargetWindow( wxWindow *target )
+{
+    wxASSERT_MSG( target, wxT("target window must not be NULL") );
+    m_targetWindow = target;
+}
 
+wxWindow *wxScrolledWindow::GetTargetWindow()
+{
+    return m_targetWindow;
 }
 
-int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
+void wxScrolledWindow::OnScroll(wxScrollWinEvent& event)
 {
-  int pos = event.GetPosition();
-  int orient = event.GetOrientation();
+    int orient = event.GetOrientation();
+
+    int nScrollInc = CalcScrollInc(event);
+    if (nScrollInc == 0) return;
 
-  int nScrollInc = 0;
-  switch (event.GetEventType())
-  {
-    case wxEVENT_TYPE_SCROLL_TOP:
+    if (orient == wxHORIZONTAL)
     {
-      if (orient == wxHORIZONTAL)
-        nScrollInc = - m_xScrollPosition;
-      else
-        nScrollInc = - m_yScrollPosition;
-      break;
+        int newPos = m_xScrollPosition + nScrollInc;
+        SetScrollPos(wxHORIZONTAL, newPos, TRUE );
     }
-    case wxEVENT_TYPE_SCROLL_BOTTOM:
+    else
     {
-      if (orient == wxHORIZONTAL)
-        nScrollInc = m_xScrollLines - m_xScrollPosition;
-      else
-        nScrollInc = m_yScrollLines - m_yScrollPosition;
-      break;
+        int newPos = m_yScrollPosition + nScrollInc;
+        SetScrollPos(wxVERTICAL, newPos, TRUE );
     }
-    case wxEVENT_TYPE_SCROLL_LINEUP:
+
+    if (orient == wxHORIZONTAL)
     {
-      nScrollInc = -1;
-      break;
+        m_xScrollPosition += nScrollInc;
     }
-    case wxEVENT_TYPE_SCROLL_LINEDOWN:
+    else
     {
-      nScrollInc = 1;
-      break;
+        m_yScrollPosition += nScrollInc;
     }
-    case wxEVENT_TYPE_SCROLL_PAGEUP:
+  
+    if (orient == wxHORIZONTAL)
     {
-      if (orient == wxHORIZONTAL)
-        nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
-      else
-        nScrollInc = -GetScrollPageSize(wxVERTICAL);
-      break;
+       if (m_xScrollingEnabled)
+            m_targetWindow->ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
+       else
+            m_targetWindow->Refresh();
     }
-    case wxEVENT_TYPE_SCROLL_PAGEDOWN:
+    else
     {
-      if (orient == wxHORIZONTAL)
-        nScrollInc = GetScrollPageSize(wxHORIZONTAL);
-      else
-        nScrollInc = GetScrollPageSize(wxVERTICAL);
-      break;
+        if (m_yScrollingEnabled)
+            m_targetWindow->ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
+        else
+            m_targetWindow->Refresh();
+  }
+#ifdef __WXMAC__
+	m_targetWindow->MacUpdateImmediately() ;
+#endif
+}
+
+int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
+{
+    int pos = event.GetPosition();
+    int orient = event.GetOrientation();
+
+    int nScrollInc = 0;
+    switch (event.GetEventType())
+    {
+        case wxEVT_SCROLLWIN_TOP:
+        {
+            if (orient == wxHORIZONTAL)
+                nScrollInc = - m_xScrollPosition;
+            else
+                nScrollInc = - m_yScrollPosition;
+            break;
+        }
+        case wxEVT_SCROLLWIN_BOTTOM:
+        {
+            if (orient == wxHORIZONTAL)
+                nScrollInc = m_xScrollLines - m_xScrollPosition;
+            else
+                nScrollInc = m_yScrollLines - m_yScrollPosition;
+            break;
+        }
+        case wxEVT_SCROLLWIN_LINEUP:
+        {
+            nScrollInc = -1;
+            break;
+        }
+        case wxEVT_SCROLLWIN_LINEDOWN:
+        {
+            nScrollInc = 1;
+            break;
+        }
+        case wxEVT_SCROLLWIN_PAGEUP:
+        {
+            if (orient == wxHORIZONTAL)
+                nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
+            else
+                nScrollInc = -GetScrollPageSize(wxVERTICAL);
+            break;
+        }
+        case wxEVT_SCROLLWIN_PAGEDOWN:
+        {
+            if (orient == wxHORIZONTAL)
+                nScrollInc = GetScrollPageSize(wxHORIZONTAL);
+            else
+                nScrollInc = GetScrollPageSize(wxVERTICAL);
+            break;
+        }
+        case wxEVT_SCROLLWIN_THUMBTRACK:
+        {
+            if (orient == wxHORIZONTAL)
+                nScrollInc = pos - m_xScrollPosition;
+            else
+                nScrollInc = pos - m_yScrollPosition;
+            break;
+        }
+        default:
+        {
+            break;
+        }
     }
-    case wxEVENT_TYPE_SCROLL_THUMBTRACK:
+
+    if (orient == wxHORIZONTAL)
     {
-      if (orient == wxHORIZONTAL)
-        nScrollInc = pos - m_xScrollPosition;
-      else
-        nScrollInc = pos - m_yScrollPosition;
-      break;
+        if (m_xScrollPixelsPerLine > 0) 
+        {
+            int w, h;
+            m_targetWindow->GetClientSize(&w, &h);
+
+            int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
+            int noPositions = (int) ( ((nMaxWidth - w)/(double)m_xScrollPixelsPerLine) + 0.5 );
+            if (noPositions < 0)
+	        noPositions = 0;
+
+            if ( (m_xScrollPosition + nScrollInc) < 0 )
+	        nScrollInc = -m_xScrollPosition; // As -ve as we can go
+            else if ( (m_xScrollPosition + nScrollInc) > noPositions )
+	        nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
+        }
+        else
+            m_targetWindow->Refresh();
     }
-    default:
+    else
     {
-      break;
+        if (m_yScrollPixelsPerLine > 0) 
+	{
+            int w, h;
+            m_targetWindow->GetClientSize(&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
+        }
+        else
+            m_targetWindow->Refresh();
     }
-  }
-  if (orient == wxHORIZONTAL)
-  {
-        int w, h;
-		GetClientSize(&w, &h);
-
-    	int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
-    	int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
-    	if (noPositions < 0)
-      		noPositions = 0;
-
-		if ( (m_xScrollPosition + nScrollInc) < 0 )
-			nScrollInc = -m_xScrollPosition; // As -ve as we can go
-		else if ( (m_xScrollPosition + nScrollInc) > noPositions )
-			nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
-
-        return nScrollInc;
-  }
-  else
-  {
-        int w, h;
-		GetClientSize(&w, &h);
-
-    	int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
-    	int noPositions = (int) ( ((nMaxHeight - h)/(float)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
-
-        return nScrollInc;
-  }
+
+    return nScrollInc;
 }
 
 // Adjust the scrollbars - new version.
-void wxScrolledWindow::AdjustScrollbars(void)
+void wxScrolledWindow::AdjustScrollbars()
 {
-  int w, h;
-  GetClientSize(&w, &h);
-
-  // Recalculate scroll bar range and position
-  if (m_xScrollLines > 0)
-  {
-    int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
-    int newRange = (int) ( ((nMaxWidth)/(float)m_xScrollPixelsPerLine) + 0.5 );
-    if (newRange < 0)
-      newRange = 0;
-
-    m_xScrollPosition = wxMin(newRange, m_xScrollPosition);
+    int w, h;
+    m_targetWindow->GetClientSize(&w, &h);
+    
+    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/(float)m_xScrollPixelsPerLine) + 0.5 );
-    if (noPagePositions < 1)
-      noPagePositions = 1;
+        int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
+        if (noPagePositions < 1) noPagePositions = 1;
 
-    SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, newRange);
-    SetScrollPageSize(wxHORIZONTAL, noPagePositions);
-  }
-  // Robert Roebling
-  else
-  { 
-    m_xScrollPosition = 0;
-    SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE);  
-  }
-    
-  if (m_yScrollLines > 0)
-  {
-    int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
-    int newRange = (int) ( ((nMaxHeight)/(float)m_yScrollPixelsPerLine) + 0.5 );
-    if (newRange < 0)
-      newRange = 0;
-
-    m_yScrollPosition = wxMin(newRange, m_yScrollPosition);
+        // 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 );
 
+        SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
+        // The amount by which we scroll when paging
+        SetScrollPageSize(wxHORIZONTAL, noPagePositions);
+    }
+    else
+    { 
+        m_xScrollPosition = 0;
+        SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE);  
+    }
+    
+    if (m_yScrollLines > 0)
+    {
 	// Calculate page size i.e. number of scroll units you get on the
 	// current client window
-    int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
-    if (noPagePositions < 1)
-      noPagePositions = 1;
+        int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
+        if (noPagePositions < 1) noPagePositions = 1;
 
-    SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, newRange);
-    SetScrollPageSize(wxVERTICAL, noPagePositions);
-  }
-  else
-  {
-    m_yScrollPosition = 0;
-    SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);  // Robert Roebling
-  }
-  
+        // 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 );
+
+        SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
+        // The amount by which we scroll when paging
+        SetScrollPageSize(wxVERTICAL, noPagePositions);
+    }
+    else
+    {
+        m_yScrollPosition = 0;
+        SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); 
+    }
+    
+    if (oldXScroll != m_xScrollPosition)
+    {
+       if (m_xScrollingEnabled)
+            m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll-m_xScrollPosition), 0, (const wxRect *) NULL );
+       else
+            m_targetWindow->Refresh();
+    }
+    
+    if (oldYScroll != m_yScrollPosition)
+    {
+        if (m_yScrollingEnabled)
+            m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition), (const wxRect *) NULL );
+        else
+            m_targetWindow->Refresh();
+    }
 }
 
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {
-#if USE_CONSTRAINTS
-  if (GetAutoLayout())
-    Layout();
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout()) Layout();
 #endif
 
-  AdjustScrollbars();
+    AdjustScrollbars();
 }
 
 // This calls OnDraw, having adjusted the origin according to the current
 // scroll position
 void wxScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-	wxPaintDC dc(this);
-	PrepareDC(dc);
+    wxPaintDC dc(this);
+    PrepareDC(dc);
 
-	OnDraw(dc);
+    OnDraw(dc);
 }
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.
 void wxScrolledWindow::PrepareDC(wxDC& dc)
 {
-	dc.SetDeviceOrigin(- m_xScrollPosition * m_xScrollPixelsPerLine, - m_yScrollPosition * m_yScrollPixelsPerLine);
+    dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine, 
+                        -m_yScrollPosition * m_yScrollPixelsPerLine );
+    dc.SetUserScale( m_scaleX, m_scaleY );
 }
 
 #if WXWIN_COMPATIBILITY
@@ -360,12 +434,22 @@ void wxScrolledWindow::GetScrollUnitsPerPage (int *x_page, int *y_page) const
       *x_page = GetScrollPageSize(wxHORIZONTAL);
       *y_page = GetScrollPageSize(wxVERTICAL);
 }
-#endif
+
+void wxScrolledWindow::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
 
 void wxScrolledWindow::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
 {
-      *x_unit = m_xScrollPixelsPerLine;
-      *y_unit = m_yScrollPixelsPerLine;
+    if ( x_unit )
+        *x_unit = m_xScrollPixelsPerLine;
+    if ( y_unit )
+        *y_unit = m_yScrollPixelsPerLine;
 }
 
 int wxScrolledWindow::GetScrollPageSize(int orient) const
@@ -387,58 +471,99 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize)
 /*
  * Scroll to given position (scroll position, not pixel position)
  */
-void wxScrolledWindow::Scroll (int x_pos, int y_pos)
+void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 {
-  int old_x, old_y;
-  ViewStart (&old_x, &old_y);
-  if (((x_pos == -1) || (x_pos == old_x)) && ((y_pos == -1) || (y_pos == old_y)))
-    return;
+    if (((x_pos == -1) || (x_pos == m_xScrollPosition)) && 
+        ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
+  
+    int w, h;
+    m_targetWindow->GetClientSize(&w, &h);
 
-  if (x_pos > -1)
+    if (x_pos != -1)
     {
-      m_xScrollPosition = x_pos;
-      SetScrollPos (wxHORIZONTAL, x_pos, TRUE);
+        int old_x = m_xScrollPosition;
+        m_xScrollPosition = x_pos;
+    
+	// 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;
+
+        // 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_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
+	
+	m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
     }
-  if (y_pos > -1)
+    if (y_pos != -1)
     {
-      m_yScrollPosition = y_pos;
-      SetScrollPos (wxVERTICAL, y_pos, TRUE);
+        int old_y = m_yScrollPosition;
+        m_yScrollPosition = y_pos;
+	
+	// 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;
+
+        // 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_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
+	
+	m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
     }
-  Refresh();
+    
+    
 #ifdef __WXMSW__
-  ::UpdateWindow ((HWND) GetHWND());
+//    ::UpdateWindow ((HWND) GetHWND());
+#else
+//    Refresh();
+#endif
+#ifdef __WXMAC__
+		m_targetWindow->MacUpdateImmediately() ;
 #endif
 }
 
 void wxScrolledWindow::EnableScrolling (bool x_scroll, bool y_scroll)
 {
-  m_xScrollingEnabled = x_scroll;
-  m_yScrollingEnabled = y_scroll;
+    m_xScrollingEnabled = x_scroll;
+    m_yScrollingEnabled = y_scroll;
 }
 
 void wxScrolledWindow::GetVirtualSize (int *x, int *y) const
 {
-      *x = m_xScrollPixelsPerLine * m_xScrollLines;
-      *y = m_yScrollPixelsPerLine * m_yScrollLines;
+    if ( x )
+        *x = m_xScrollPixelsPerLine * m_xScrollLines;
+    if ( y )
+        *y = m_yScrollPixelsPerLine * m_yScrollLines;
 }
 
 // Where the current view starts from
 void wxScrolledWindow::ViewStart (int *x, int *y) const
 {
-  *x = m_xScrollPosition;
-  *y = m_yScrollPosition;
+    if ( x )
+        *x = m_xScrollPosition;
+    if ( y )
+        *y = m_yScrollPosition;
 }
 
 void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
-  *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
-  *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
+    if ( xx )
+        *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
+    if ( yy )
+        *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
 }
 
-void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
+void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
 {
-  *xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
-  *yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
+    if ( xx )
+        *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
+    if ( yy )
+        *yy = y + m_yScrollPosition * m_yScrollPixelsPerLine;
 }
-
-