Don't hard code "2.9.3" in the release preparation instructions.

[wxWidgets.git] / src / stc / stc.cpp.in

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 9a6562eed3ddab6adfe50d4954d14e72cf411274..a635b561df4db6fea589bba5b8766502e777040a 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -571,7 +571,7 @@ wxStyledTextCtrl::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
     if ( file.IsOpened() )
     {
         wxString text;
     if ( file.IsOpened() )
     {
         wxString text;

-        if ( file.ReadAll(&text, *wxConvCurrent) )
+        if ( file.ReadAll(&text, wxConvAuto()) )

         {
             // Detect the EOL: we use just the first line because there is not
             // much we can do if the file uses inconsistent EOLs anyhow, we'd
         {
             // Detect the EOL: we use just the first line because there is not
             // much we can do if the file uses inconsistent EOLs anyhow, we'd


@@ -833,9 +833,11 @@ void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
 
 void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt)
 {
 
 void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt)
 {

-    m_swx->DoMouseWheel(evt.GetWheelRotation(),
+    m_swx->DoMouseWheel(evt.GetWheelAxis(),
+                        evt.GetWheelRotation(),

                         evt.GetWheelDelta(),
                         evt.GetLinesPerAction(),
                         evt.GetWheelDelta(),
                         evt.GetLinesPerAction(),

+                        evt.GetColumnsPerAction(),

                         evt.ControlDown(),
                         evt.IsPageScroll());
 }
                         evt.ControlDown(),
                         evt.IsPageScroll());
 }