wxUpdateUIEvent derives from wxCommandEvent now

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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 8cabb75feb5d89dab73cff8d6f65e397efb92959..4305d4a8664474e532422bd199327b748b92ff73 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,6 +52,8 @@ 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, wxWindowID id,
@@ -70,6 +72,8 @@ bool wxScrolledWindow::Create(wxWindow *parent, 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);
 }
@@ -96,14 +100,16 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
       
       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();
   }
@@ -350,6 +356,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
@@ -403,7 +410,7 @@ void wxScrolledWindow::Scroll (int x_pos, int y_pos)
       SetScrollPos (wxVERTICAL, y_pos, TRUE);
     }
   Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   ::UpdateWindow ((HWND) GetHWND());
 #endif
 }