wxRTC table layout now uses cell content to calculate column widths if no other width...

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

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 1fa360de2d6af27e1f2f9533f12427b1cb0b9876..93e4266d2bef4036d5bff6a3ac497dae9d4b5e9a 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -10,7 +10,6 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +49,11 @@
 #if wxUSE_FFILE
     #include "wx/ffile.h"
 #elif wxUSE_FILE
-    #include "wx/ffile.h"
+    #include "wx/file.h"
+#endif
+
+#ifdef __WXGTK__
+    #include "wx/dcbuffer.h"
 #endif
 
 #include "ScintillaWX.h"
@@ -1793,12 +1796,12 @@ int wxStyledTextCtrl::GetTargetEnd() const
          return SendMsg(2194, wx2stclen(text, buf), (sptr_t)(const char*)buf);
 }
 
-// Replace the target text with the argument text after \d processing.
+// Replace the target text with the argument text after \\d processing.
 // Text is counted so it can contain NULs.
-// Looks for \d where d is between 1 and 9 and replaces these with the strings
+// Looks for \\d where d is between 1 and 9 and replaces these with the strings
 // matched in the last search operation which were surrounded by \( and \).
 // Returns the length of the replacement text including any change
-// caused by processing the \d patterns.
+// caused by processing the \\d patterns.
 
      int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
          const wxWX2MBbuf buf = wx2stc(text);
@@ -2207,7 +2210,7 @@ void wxStyledTextCtrl::SetMultiPaste(int multiPaste)
     SendMsg(2614, multiPaste, 0);
 }
 
-// Retrieve the effect of pasting when there are multiple selections..
+// Retrieve the effect of pasting when there are multiple selections.
 int wxStyledTextCtrl::GetMultiPaste() const
 {
     return SendMsg(2615, 0, 0);
@@ -4383,7 +4386,7 @@ void wxStyledTextCtrl::DoSetValue(const wxString& value, int flags)
     else
         SetText(value);
 
-    // We don't send wxEVT_COMMAND_TEXT_UPDATED anyhow, so ignore the
+    // We don't send wxEVT_TEXT anyhow, so ignore the
     // SetValue_SendEvent bit of the flags
 }
 
@@ -4429,7 +4432,7 @@ wxStyledTextCtrl::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
     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
@@ -4505,7 +4508,7 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() {
 }
 
 void wxStyledTextCtrl::AnnotationClearLine(int line) {
-    SendMsg(SCI_ANNOTATIONSETTEXT, line, NULL);
+    SendMsg(SCI_ANNOTATIONSETTEXT, line, (sptr_t)NULL);
 }
 
 
@@ -4612,7 +4615,11 @@ void wxStyledTextCtrl::AppendTextRaw(const char* text, int length)
 // Event handlers
 
 void wxStyledTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) {
+#ifdef __WXGTK__
+    wxBufferedPaintDC dc(this);
+#else
     wxPaintDC dc(this);
+#endif
     m_swx->DoPaint(&dc, GetUpdateRegion().GetBox());
 }
 
@@ -4687,9 +4694,11 @@ void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
 
 void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt)
 {
-    m_swx->DoMouseWheel(evt.GetWheelRotation(),
+    m_swx->DoMouseWheel(evt.GetWheelAxis(),
+                        evt.GetWheelRotation(),
                         evt.GetWheelDelta(),
                         evt.GetLinesPerAction(),
+                        evt.GetColumnsPerAction(),
                         evt.ControlDown(),
                         evt.IsPageScroll());
 }