no message

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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index f82d3fa0d4ecf62a302df376032a285a4362a88e..bdc9467d737311fcfe3a7539f95c0686404a4235 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -20,7 +20,7 @@
 #include "wx/utils.h"
 #include "wx/dcclient.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "windows.h"
 #endif
 
@@ -52,12 +52,14 @@ wxScrolledWindow::wxScrolledWindow(void)
   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 long style,
+           long style,
            const wxString& name)
 {
   m_xScrollPixelsPerLine = 0;
@@ -70,6 +72,8 @@ bool wxScrolledWindow::Create(wxWindow *parent, const wxWindowID id,
   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);
 }
@@ -78,9 +82,9 @@ bool wxScrolledWindow::Create(wxWindow *parent, const wxWindowID id,
  * 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 =
      (
@@ -96,14 +100,16 @@ void wxScrolledWindow::SetScrollbars (const int pixelsPerUnitX, const int pixels
       
       m_xScrollPixelsPerLine = pixelsPerUnitX;
       m_yScrollPixelsPerLine = pixelsPerUnitY;
+      m_xScrollPosition = xPos;
+      m_yScrollPosition = yPos;
       m_xScrollLines = noUnitsX;
       m_yScrollLines = noUnitsY;
-
+      
    AdjustScrollbars();
    
    if (do_refresh && !noRefresh) Refresh();
    
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     UpdateWindow ((HWND) GetHWND());
 #endif
 }
@@ -153,14 +159,14 @@ void wxScrolledWindow::OnScroll(wxScrollEvent& event)
   if (orient == wxHORIZONTAL)
   {
     if (m_xScrollingEnabled)
-      ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, NULL);
+      ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
     else
       Refresh();
   }
   else
   {
     if (m_yScrollingEnabled)
-      ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, NULL);
+      ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
     else
       Refresh();
   }
@@ -232,38 +238,44 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
   }
   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
   {
-        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.
@@ -327,7 +339,7 @@ void wxScrolledWindow::AdjustScrollbars(void)
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
   if (GetAutoLayout())
     Layout();
 #endif
@@ -350,6 +362,7 @@ void wxScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 void wxScrolledWindow::PrepareDC(wxDC& dc)
 {
        dc.SetDeviceOrigin(- m_xScrollPosition * m_xScrollPixelsPerLine, - m_yScrollPosition * m_yScrollPixelsPerLine);
+    dc.SetUserScale(m_scaleX, m_scaleY);
 }
 
 #if WXWIN_COMPATIBILITY
@@ -385,7 +398,7 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize)
 /*
  * 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);
@@ -403,12 +416,12 @@ void wxScrolledWindow::Scroll (const int x_pos, const int y_pos)
       SetScrollPos (wxVERTICAL, y_pos, TRUE);
     }
   Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   ::UpdateWindow ((HWND) GetHWND());
 #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;
@@ -427,13 +440,13 @@ void wxScrolledWindow::ViewStart (int *x, int *y) const
   *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;
 }
 
-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);