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 54571bb3de8e99dd0fbc3577f763fef3b3480828..c31f350f55f9ee09f129cb392f0280cc56793dea 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -12,7 +12,7 @@
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -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);
 }
 


@@ -4573,8 +4573,8 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
     m_listType = 0;
     m_x = 0;
     m_y = 0;
     m_listType = 0;
     m_x = 0;
     m_y = 0;

-    m_dragAllowMove = false;

 #if wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP

+    m_dragFlags = wxDrag_CopyOnly;

     m_dragResult = wxDragNone;
 #endif
 }
     m_dragResult = wxDragNone;
 #endif
 }


@@ -4608,9 +4608,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
     m_x =            event.m_x;
     m_y =            event.m_y;
 
     m_x =            event.m_x;
     m_y =            event.m_y;
 

-    m_dragText =     event.m_dragText;
-    m_dragAllowMove =event.m_dragAllowMove;

 #if wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP

+    m_dragText =     event.m_dragText;
+    m_dragFlags =    event.m_dragFlags;

     m_dragResult =   event.m_dragResult;
 #endif
 }
     m_dragResult =   event.m_dragResult;
 #endif
 }


@@ -4618,4 +4618,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 

+/*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
+{
+    return wxVersionInfo("Scintilla", 2, 3, 0, "Scintilla 2.03");
+}
+

 #endif // wxUSE_STC
 #endif // wxUSE_STC