Regenerated makefiles

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 1fe62de7bf13252e2822d168772befa42ccef5f7..cd61575c370e548016ed92e27659cf7cb2bc1c9a 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -652,7 +652,8 @@ void wxScrollHelper::AdjustScrollbars()
         }
         else
         {
         }
         else
         {

-            m_xScrollLines = m_targetWindow->GetVirtualSize().GetWidth() / m_xScrollPixelsPerLine;
+            int vVirt = m_targetWindow->GetVirtualSize().GetWidth();
+            m_xScrollLines = vVirt / m_xScrollPixelsPerLine;

 
             // 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


@@ -1175,14 +1176,14 @@ void wxScrollHelper::HandleOnMouseWheel(wxMouseEvent& event)
 
         newEvent.SetPosition(0);
         newEvent.SetOrientation(wxVERTICAL);
 
         newEvent.SetPosition(0);
         newEvent.SetOrientation(wxVERTICAL);

-        newEvent.m_eventObject = m_win;
+        newEvent.SetEventObject(m_win);

 
         if (event.IsPageScroll())
         {
             if (lines > 0)
 
         if (event.IsPageScroll())
         {
             if (lines > 0)

-                newEvent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+                newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP);

             else
             else

-                newEvent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+                newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN);

 
             m_win->GetEventHandler()->ProcessEvent(newEvent);
         }
 
             m_win->GetEventHandler()->ProcessEvent(newEvent);
         }


@@ -1190,9 +1191,9 @@ void wxScrollHelper::HandleOnMouseWheel(wxMouseEvent& event)
         {
             lines *= event.GetLinesPerAction();
             if (lines > 0)
         {
             lines *= event.GetLinesPerAction();
             if (lines > 0)

-                newEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+                newEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP);

             else
             else

-                newEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+                newEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN);

 
             int times = abs(lines);
             for (; times > 0; times--)
 
             int times = abs(lines);
             for (; times > 0; times--)