Added Property List classes to main library; added proplist sample; merged

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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index f82d3fa0d4ecf62a302df376032a285a4362a88e..4bb0b3a77c716a0cf15dcd4f2af94f806466b552 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -20,7 +20,7 @@
 #include "wx/utils.h"
 #include "wx/dcclient.h"
 
 #include "wx/utils.h"
 #include "wx/dcclient.h"
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include "windows.h"
 #endif
 
 #include "windows.h"
 #endif
 


@@ -32,9 +32,9 @@
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)

-  EVT_SCROLL(wxScrolledWindow::OnScroll)
-  EVT_SIZE(wxScrolledWindow::OnSize)
-  EVT_PAINT(wxScrolledWindow::OnPaint)
+    EVT_SCROLL(wxScrolledWindow::OnScroll)
+    EVT_SIZE(wxScrolledWindow::OnSize)
+    EVT_PAINT(wxScrolledWindow::OnPaint)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)


@@ -42,48 +42,52 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
 
 wxScrolledWindow::wxScrolledWindow(void)
 {
 
 wxScrolledWindow::wxScrolledWindow(void)
 {

-  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, const wxWindowID id,
+bool wxScrolledWindow::Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos,
            const wxSize& size,
            const wxPoint& pos,
            const wxSize& size,

-           const long style,
+           long style,

            const wxString& name)
 {
            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;
+
+    return wxWindow::Create(parent, id, pos, size, style, name);

 }
 
 /*
  * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
  * noUnitsX/noUnitsY:        : no. units per scrollbar
  */
 }
 
 /*
  * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
  * noUnitsX/noUnitsY:        : no. units per scrollbar
  */

-void wxScrolledWindow::SetScrollbars (const int pixelsPerUnitX, const int pixelsPerUnitY,
-              const int noUnitsX, const int noUnitsY,
-              const int xPos, const int yPos, const bool noRefresh )
+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) ||
       (noUnitsY != 0 && m_yScrollLines == 0) ||
       (noUnitsX != 0 && m_xScrollLines == 0) ||
       (noUnitsX < m_xScrollPosition) ||
       (noUnitsY != 0 && m_yScrollLines == 0) ||


@@ -92,79 +96,65 @@ void wxScrolledWindow::SetScrollbars (const int pixelsPerUnitX, const int pixels
       (yPos != m_yScrollPosition) ||
       (pixelsPerUnitX != m_xScrollPixelsPerLine) ||
       (pixelsPerUnitY != m_yScrollPixelsPerLine)
       (yPos != m_yScrollPosition) ||
       (pixelsPerUnitX != m_xScrollPixelsPerLine) ||
       (pixelsPerUnitY != m_yScrollPixelsPerLine)

-     );
+    );

       
       

-      m_xScrollPixelsPerLine = pixelsPerUnitX;
-      m_yScrollPixelsPerLine = pixelsPerUnitY;
-      m_xScrollLines = noUnitsX;
-      m_yScrollLines = noUnitsY;
-
-   AdjustScrollbars();
+    m_xScrollPixelsPerLine = pixelsPerUnitX;
+    m_yScrollPixelsPerLine = pixelsPerUnitY;
+    m_xScrollPosition = xPos;
+    m_yScrollPosition = yPos;
+    m_xScrollLines = noUnitsX;
+    m_yScrollLines = noUnitsY;
+      
+    AdjustScrollbars();

    
    if (do_refresh && !noRefresh) Refresh();
    
    
    if (do_refresh && !noRefresh) Refresh();
    

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

     UpdateWindow ((HWND) GetHWND());
 #endif
 }
 
 void wxScrolledWindow::OnScroll(wxScrollEvent& event)
 {
     UpdateWindow ((HWND) GetHWND());
 #endif
 }
 
 void wxScrolledWindow::OnScroll(wxScrollEvent& event)
 {

-  int orient = event.GetOrientation();
+    int orient = event.GetOrientation();

 
 

-  int nScrollInc = CalcScrollInc(event);
-  if (nScrollInc == 0)
-    return;
+    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)
+    {
+        int newPos = m_xScrollPosition + nScrollInc;
+        SetScrollPos(wxHORIZONTAL, newPos, TRUE );
+    }
+    else
+    {
+        int newPos = m_yScrollPosition + nScrollInc;
+        SetScrollPos(wxVERTICAL, newPos, TRUE );
+    }

 
 

-  if (orient == wxHORIZONTAL)
-  {
-    m_xScrollPosition += nScrollInc;
-  }
-  else
-  {
-    m_yScrollPosition += nScrollInc;
-  }
-  
-  if (orient == wxHORIZONTAL)
-  {
-    if (m_xScrollingEnabled)
-      ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, NULL);
+    if (orient == wxHORIZONTAL)
+    {
+        m_xScrollPosition += nScrollInc;
+    }

     else
     else

-      Refresh();
-  }
-  else
-  {
-    if (m_yScrollingEnabled)
-      ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, NULL);
+    {
+        m_yScrollPosition += nScrollInc;
+    }
+  
+    if (orient == wxHORIZONTAL)
+    {
+       if (m_xScrollingEnabled)
+            ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
+       else
+            Refresh();
+    }

     else
     else

-      Refresh();
+    {
+        if (m_yScrollingEnabled)
+            ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
+        else
+            Refresh();

   }
   }

-

 }
 
 int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
 }
 
 int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)


@@ -175,7 +165,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
   int nScrollInc = 0;
   switch (event.GetEventType())
   {
   int nScrollInc = 0;
   switch (event.GetEventType())
   {

-    case wxEVENT_TYPE_SCROLL_TOP:
+    case wxEVT_SCROLL_TOP:

     {
       if (orient == wxHORIZONTAL)
         nScrollInc = - m_xScrollPosition;
     {
       if (orient == wxHORIZONTAL)
         nScrollInc = - m_xScrollPosition;


@@ -183,7 +173,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
         nScrollInc = - m_yScrollPosition;
       break;
     }
         nScrollInc = - m_yScrollPosition;
       break;
     }

-    case wxEVENT_TYPE_SCROLL_BOTTOM:
+    case wxEVT_SCROLL_BOTTOM:

     {
       if (orient == wxHORIZONTAL)
         nScrollInc = m_xScrollLines - m_xScrollPosition;
     {
       if (orient == wxHORIZONTAL)
         nScrollInc = m_xScrollLines - m_xScrollPosition;


@@ -191,17 +181,17 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
         nScrollInc = m_yScrollLines - m_yScrollPosition;
       break;
     }
         nScrollInc = m_yScrollLines - m_yScrollPosition;
       break;
     }

-    case wxEVENT_TYPE_SCROLL_LINEUP:
+    case wxEVT_SCROLL_LINEUP:

     {
       nScrollInc = -1;
       break;
     }
     {
       nScrollInc = -1;
       break;
     }

-    case wxEVENT_TYPE_SCROLL_LINEDOWN:
+    case wxEVT_SCROLL_LINEDOWN:

     {
       nScrollInc = 1;
       break;
     }
     {
       nScrollInc = 1;
       break;
     }

-    case wxEVENT_TYPE_SCROLL_PAGEUP:
+    case wxEVT_SCROLL_PAGEUP:

     {
       if (orient == wxHORIZONTAL)
         nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
     {
       if (orient == wxHORIZONTAL)
         nScrollInc = -GetScrollPageSize(wxHORIZONTAL);


@@ -209,7 +199,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
         nScrollInc = -GetScrollPageSize(wxVERTICAL);
       break;
     }
         nScrollInc = -GetScrollPageSize(wxVERTICAL);
       break;
     }

-    case wxEVENT_TYPE_SCROLL_PAGEDOWN:
+    case wxEVT_SCROLL_PAGEDOWN:

     {
       if (orient == wxHORIZONTAL)
         nScrollInc = GetScrollPageSize(wxHORIZONTAL);
     {
       if (orient == wxHORIZONTAL)
         nScrollInc = GetScrollPageSize(wxHORIZONTAL);


@@ -217,7 +207,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
         nScrollInc = GetScrollPageSize(wxVERTICAL);
       break;
     }
         nScrollInc = GetScrollPageSize(wxVERTICAL);
       break;
     }

-    case wxEVENT_TYPE_SCROLL_THUMBTRACK:
+    case wxEVT_SCROLL_THUMBTRACK:

     {
       if (orient == wxHORIZONTAL)
         nScrollInc = pos - m_xScrollPosition;
     {
       if (orient == wxHORIZONTAL)
         nScrollInc = pos - m_xScrollPosition;


@@ -230,126 +220,127 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
       break;
     }
   }
       break;
     }
   }

+

   if (orient == wxHORIZONTAL)
   {
   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;
+    if (m_xScrollPixelsPerLine > 0) {
+      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
+    }
+    else
+      Refresh();

   }
   else
   {
   }
   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;
+    if (m_yScrollPixelsPerLine > 0) {
+      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
+    }
+    else
+      Refresh();

   }
   }

+
+  return nScrollInc;

 }
 
 // Adjust the scrollbars - new version.
 void wxScrolledWindow::AdjustScrollbars(void)
 {
 }
 
 // Adjust the scrollbars - new version.
 void wxScrolledWindow::AdjustScrollbars(void)
 {

-  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;
+    GetClientSize(&w, &h);

 
 

+    if (m_xScrollLines > 0)
+    {

        // 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) ( (w/(float)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;
+        int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
+        if (noPagePositions < 1) noPagePositions = 1;

 
 

-    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
        // 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/(float)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); 
+    }

 }
 
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 }
 
 // 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
 
 #endif
 

-  AdjustScrollbars();
+    AdjustScrollbars();

 }
 
 // This calls OnDraw, having adjusted the origin according to the current
 // scroll position
 void wxScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 }
 
 // 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)
 {
 }
 
 // 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
 }
 
 #if WXWIN_COMPATIBILITY


@@ -385,58 +376,83 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize)
 /*
  * Scroll to given position (scroll position, not pixel position)
  */
 /*
  * Scroll to given position (scroll position, not pixel position)
  */

-void wxScrolledWindow::Scroll (const int x_pos, const 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;
+    GetClientSize(&w, &h);

 
 

-  if (x_pos > -1)
+    if (x_pos != -1)

     {
     {

-      m_xScrollPosition = x_pos;
-      SetScrollPos (wxHORIZONTAL, x_pos, TRUE);
+        m_xScrollPosition = x_pos;
+    
+       // 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;
+
+        // 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 );
+      
+        SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );

     }
     }

-  if (y_pos > -1)
+    if (y_pos != -1)

     {
     {

-      m_yScrollPosition = y_pos;
-      SetScrollPos (wxVERTICAL, y_pos, TRUE);
+        m_yScrollPosition = y_pos;
+       
+       // 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;
+
+        // 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 );
+       
+        SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );

     }
     }

-  Refresh();
-#ifdef __WINDOWS__
-  ::UpdateWindow ((HWND) GetHWND());
+    
+    Refresh();
+    
+#ifdef __WXMSW__
+    ::UpdateWindow ((HWND) GetHWND());

 #endif
 }
 
 #endif
 }
 

-void wxScrolledWindow::EnableScrolling (const bool x_scroll, const bool y_scroll)
+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
 {
 }
 
 void wxScrolledWindow::GetVirtualSize (int *x, int *y) const
 {

-      *x = m_xScrollPixelsPerLine * m_xScrollLines;
-      *y = m_yScrollPixelsPerLine * m_yScrollLines;
+    *x = m_xScrollPixelsPerLine * m_xScrollLines;
+    *y = m_yScrollPixelsPerLine * m_yScrollLines;

 }
 
 // Where the current view starts from
 void wxScrolledWindow::ViewStart (int *x, int *y) const
 {
 }
 
 // Where the current view starts from
 void wxScrolledWindow::ViewStart (int *x, int *y) const
 {

-  *x = m_xScrollPosition;
-  *y = m_yScrollPosition;
+    *x = m_xScrollPosition;
+    *y = m_yScrollPosition;

 }
 
 }
 

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

 {
 {

-  *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
-  *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
+    *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
+    *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;

 }
 
 }
 

-void wxScrolledWindow::CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const
+void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const

 {
 {

-  *xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
-  *yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
+    *xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
+    *yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);

 }
 
 
 }