Add some version checks to help compiling on OSX.

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

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index ca1231db4d93c84ae960d2382d5c2ce2fa7d37a0..c31f350f55f9ee09f129cb392f0280cc56793dea 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
 // 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);
                 const wxColour& background) {
 
                 SendMsg(2040, markerNumber, markerSymbol);

-                if (foreground.Ok())
+                if (foreground.IsOk())

                     MarkerSetForeground(markerNumber, foreground);
                     MarkerSetForeground(markerNumber, foreground);

-                if (background.Ok())
+                if (background.IsOk())

                     MarkerSetBackground(markerNumber, background);
 }
 
                     MarkerSetBackground(markerNumber, background);
 }
 


@@ -1964,7 +1964,7 @@ void wxStyledTextCtrl::SetWrapVisualFlags(int wrapVisualFlags)
     SendMsg(2460, wrapVisualFlags, 0);
 }
 
     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);
 int wxStyledTextCtrl::GetWrapVisualFlags() const
 {
     return SendMsg(2461, 0, 0);


@@ -1976,7 +1976,7 @@ void wxStyledTextCtrl::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation)
     SendMsg(2462, wrapVisualFlagsLocation, 0);
 }
 
     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);
 int wxStyledTextCtrl::GetWrapVisualFlagsLocation() const
 {
     return SendMsg(2463, 0, 0);


@@ -1988,7 +1988,7 @@ void wxStyledTextCtrl::SetWrapStartIndent(int indent)
     SendMsg(2464, indent, 0);
 }
 
     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);
 int wxStyledTextCtrl::GetWrapStartIndent() const
 {
     return SendMsg(2465, 0, 0);