Replace stc.{h,cpp} with the generated versions with all their typos.

Revert the changes of r67280 which fixed several typos in these files as they
were getting modified each time gen_iface.py was rerun and we don't want to
touch the original Scintilla files to fix these typos.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index faa33fa65dec9dfe0c9d927ab2aa35910c160b63..559f8823d445eae7a5b90c9c92c6d105a5b84637 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -3056,19 +3056,19 @@ public:
     // Set the display mode of visual flags for wrapped lines.
     void SetWrapVisualFlags(int wrapVisualFlags);
 
-    // Retrieve the display mode of visual flags for wrapped lines.
+    // Retrive the display mode of visual flags for wrapped lines.
     int GetWrapVisualFlags() const;
 
     // Set the location of visual flags for wrapped lines.
     void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation);
 
-    // Retrieve the location of visual flags for wrapped lines.
+    // Retrive the location of visual flags for wrapped lines.
     int GetWrapVisualFlagsLocation() const;
 
     // Set the start indent for wrapped lines.
     void SetWrapStartIndent(int indent);
 
-    // Retrieve the start indent for wrapped lines.
+    // Retrive the start indent for wrapped lines.
     int GetWrapStartIndent() const;
 
     // Sets how wrapped sublines are placed. Default is fixed.
@@ -3464,7 +3464,7 @@ public:
     // Delete forwards from the current position to the end of the line.
     void DelLineRight();
 
-    // Get and Set the xOffset (ie, horizontal scroll position).
+    // Get and Set the xOffset (ie, horizonal scroll position).
     void SetXOffset(int newOffset);
     int GetXOffset() const;
 

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b9f6da5e3e9bc6db666c2fab4cb6d565a6678b1b..b0a98e41eecbd572531fec00e00e8880a551f7e6 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
-// Name:        src/stc/stc.cpp
+// Name:        stc.cpp
 // Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
@@ -527,9 +527,9 @@ void wxStyledTextCtrl::MarkerDefine(int markerNumber, int markerSymbol,
                 const wxColour& background) {
 
                 SendMsg(2040, markerNumber, markerSymbol);
-                if (foreground.IsOk())
+                if (foreground.Ok())
                     MarkerSetForeground(markerNumber, foreground);
-                if (background.IsOk())
+                if (background.Ok())
                     MarkerSetBackground(markerNumber, background);
 }
 
@@ -1964,7 +1964,7 @@ void wxStyledTextCtrl::SetWrapVisualFlags(int wrapVisualFlags)
     SendMsg(2460, wrapVisualFlags, 0);
 }
 
-// Retrieve the display mode of visual flags for wrapped lines.
+// Retrive the display mode of visual flags for wrapped lines.
 int wxStyledTextCtrl::GetWrapVisualFlags() const
 {
     return SendMsg(2461, 0, 0);
@@ -1976,7 +1976,7 @@ void wxStyledTextCtrl::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation)
     SendMsg(2462, wrapVisualFlagsLocation, 0);
 }
 
-// Retrieve the location of visual flags for wrapped lines.
+// Retrive the location of visual flags for wrapped lines.
 int wxStyledTextCtrl::GetWrapVisualFlagsLocation() const
 {
     return SendMsg(2463, 0, 0);
@@ -1988,7 +1988,7 @@ void wxStyledTextCtrl::SetWrapStartIndent(int indent)
     SendMsg(2464, indent, 0);
 }
 
-// Retrieve the start indent for wrapped lines.
+// Retrive the start indent for wrapped lines.
 int wxStyledTextCtrl::GetWrapStartIndent() const
 {
     return SendMsg(2465, 0, 0);