Fit the generic preferences editor dialog to its pages size initially.

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

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index d1c07eb6b57865a3f7c2286ea745da577bfee970..c9b08e945c094ba98dfdeabe393443815062bfad 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -47,7 +47,15 @@
 #include "wx/tokenzr.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/tokenzr.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

-#include "wx/ffile.h"
+#if wxUSE_FFILE
+    #include "wx/ffile.h"
+#elif wxUSE_FILE
+    #include "wx/ffile.h"
+#endif
+
+#ifdef __WXGTK__
+    #include "wx/dcbuffer.h"
+#endif

 
 #include "ScintillaWX.h"
 
 
 #include "ScintillaWX.h"
 


@@ -126,6 +134,7 @@ wxDEFINE_EVENT( wxEVT_STC_INDICATOR_CLICK, wxStyledTextEvent );
 wxDEFINE_EVENT( wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
 wxDEFINE_EVENT( wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
 wxDEFINE_EVENT( wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );
 wxDEFINE_EVENT( wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
 wxDEFINE_EVENT( wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
 wxDEFINE_EVENT( wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );

+wxDEFINE_EVENT( wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );

 
 
 
 
 
 


@@ -551,7 +560,7 @@ void wxStyledTextCtrl::MarkerSetBackground(int markerNumber, const wxColour& bac
 }
 
 // Set the background colour used for a particular marker number when its folding block is selected.
 }
 
 // Set the background colour used for a particular marker number when its folding block is selected.

-void wxStyledTextCtrl::MarkerSetBackSelected(int markerNumber, const wxColour& back)
+void wxStyledTextCtrl::MarkerSetBackgroundSelected(int markerNumber, const wxColour& back)

 {
     SendMsg(2292, markerNumber, wxColourAsLong(back));
 }
 {
     SendMsg(2292, markerNumber, wxColourAsLong(back));
 }


@@ -677,13 +686,13 @@ bool wxStyledTextCtrl::GetMarginSensitive(int margin) const
 }
 
 // Set the cursor shown when the mouse is inside a margin.
 }
 
 // Set the cursor shown when the mouse is inside a margin.

-void wxStyledTextCtrl::SetMarginCursorN(int margin, int cursor)
+void wxStyledTextCtrl::SetMarginCursor(int margin, int cursor)

 {
     SendMsg(2248, margin, cursor);
 }
 
 // Retrieve the cursor shown in a margin.
 {
     SendMsg(2248, margin, cursor);
 }
 
 // Retrieve the cursor shown in a margin.

-int wxStyledTextCtrl::GetMarginCursorN(int margin) const
+int wxStyledTextCtrl::GetMarginCursor(int margin) const

 {
     return SendMsg(2249, margin, 0);
 }
 {
     return SendMsg(2249, margin, 0);
 }


@@ -962,12 +971,12 @@ void wxStyledTextCtrl::SetWordChars(const wxString& characters)
 // Get the set of characters making up words for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWordChars() const {
          int msg = 2646;
 // Get the set of characters making up words for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWordChars() const {
          int msg = 2646;

-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(msg, (sptr_t)buf);
+         SendMsg(msg, 0, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);


@@ -2211,7 +2220,7 @@ int wxStyledTextCtrl::GetMultiPaste() const
 // Retrieve the value of a tag from a regular expression search.
 wxString wxStyledTextCtrl::GetTag(int tagNumber) const {
          int msg = 2616;
 // Retrieve the value of a tag from a regular expression search.
 wxString wxStyledTextCtrl::GetTag(int tagNumber) const {
          int msg = 2616;

-         int len = SendMsg(msg, tagNumber, NULL);
+         int len = SendMsg(msg, tagNumber, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -3162,12 +3171,12 @@ void wxStyledTextCtrl::SetWhitespaceChars(const wxString& characters)
 // Get the set of characters making up whitespace for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWhitespaceChars() const {
          int msg = 2647;
 // Get the set of characters making up whitespace for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWhitespaceChars() const {
          int msg = 2647;

-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(msg, (sptr_t)buf);
+         SendMsg(msg, 0, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);


@@ -3183,12 +3192,12 @@ void wxStyledTextCtrl::SetPunctuationChars(const wxString& characters)
 // Get the set of characters making up punctuation characters
 wxString wxStyledTextCtrl::GetPunctuationChars() const {
          int msg = 2649;
 // Get the set of characters making up punctuation characters
 wxString wxStyledTextCtrl::GetPunctuationChars() const {
          int msg = 2649;

-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(msg, (sptr_t)buf);
+         SendMsg(msg, 0, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);


@@ -3207,13 +3216,13 @@ int wxStyledTextCtrl::AutoCompGetCurrent() const
 }
 
 // Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.
 }
 
 // Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.

-void wxStyledTextCtrl::AutoCSetCaseInsensitiveBehaviour(int behaviour)
+void wxStyledTextCtrl::AutoCompSetCaseInsensitiveBehaviour(int behaviour)

 {
     SendMsg(2634, behaviour, 0);
 }
 
 // Get auto-completion case insensitive behaviour.
 {
     SendMsg(2634, behaviour, 0);
 }
 
 // Get auto-completion case insensitive behaviour.

-int wxStyledTextCtrl::AutoCGetCaseInsensitiveBehaviour() const
+int wxStyledTextCtrl::AutoCompGetCaseInsensitiveBehaviour() const

 {
     return SendMsg(2635, 0, 0);
 }
 {
     return SendMsg(2635, 0, 0);
 }


@@ -3371,16 +3380,15 @@ void wxStyledTextCtrl::CopyAllowLine()
 
 // Compact the document buffer and return a read-only pointer to the
 // characters in the document.
 
 // Compact the document buffer and return a read-only pointer to the
 // characters in the document.

-const char* wxStyledTextCtrl::GetCharacterPointer() {
+const char* wxStyledTextCtrl::GetCharacterPointer() const {

     return (const char*)SendMsg(2520, 0, 0);
 }
 
 // Return a read-only pointer to a range of characters in the document.
 // May move the gap so that the range is contiguous, but will only move up
 // to rangeLength bytes.
     return (const char*)SendMsg(2520, 0, 0);
 }
 
 // Return a read-only pointer to a range of characters in the document.
 // May move the gap so that the range is contiguous, but will only move up
 // to rangeLength bytes.

-int wxStyledTextCtrl::GetRangePointer(int position, int rangeLength) const
-{
-    return SendMsg(2643, position, rangeLength);
+const char* wxStyledTextCtrl::GetRangePointer(int position, int rangeLength) const {
+    return (const char*)SendMsg(2643, position, rangeLength);

 }
 
 // Return a position which, to avoid performance costs, should not be within
 }
 
 // Return a position which, to avoid performance costs, should not be within


@@ -3415,13 +3423,13 @@ int wxStyledTextCtrl::IndicatorGetAlpha(int indicator) const
 }
 
 // Set the alpha outline colour of the given indicator.
 }
 
 // Set the alpha outline colour of the given indicator.

-void wxStyledTextCtrl::IndicSetOutlineAlpha(int indicator, int alpha)
+void wxStyledTextCtrl::IndicatorSetOutlineAlpha(int indicator, int alpha)

 {
     SendMsg(2558, indicator, alpha);
 }
 
 // Get the alpha outline colour of the given indicator.
 {
     SendMsg(2558, indicator, alpha);
 }
 
 // Get the alpha outline colour of the given indicator.

-int wxStyledTextCtrl::IndicGetOutlineAlpha(int indicator) const
+int wxStyledTextCtrl::IndicatorGetOutlineAlpha(int indicator) const

 {
     return SendMsg(2559, indicator, 0);
 }
 {
     return SendMsg(2559, indicator, 0);
 }


@@ -3939,16 +3947,14 @@ void wxStyledTextCtrl::RGBAImageSetHeight(int height)
 
 // Define a marker from RGBA data.
 // It has the width and height from RGBAImageSetWidth/Height
 
 // Define a marker from RGBA data.
 // It has the width and height from RGBAImageSetWidth/Height

-void wxStyledTextCtrl::MarkerDefineRGBAImage(int markerNumber, const wxString& pixels)
-{
-    SendMsg(2626, markerNumber, (sptr_t)(const char*)wx2stc(pixels));
+void wxStyledTextCtrl::MarkerDefineRGBAImage(int markerNumber, const unsigned char* pixels) {
+           SendMsg(2626, markerNumber, (sptr_t)pixels);

 }
 
 // Register an RGBA image for use in autocompletion lists.
 // It has the width and height from RGBAImageSetWidth/Height
 }
 
 // Register an RGBA image for use in autocompletion lists.
 // It has the width and height from RGBAImageSetWidth/Height

-void wxStyledTextCtrl::RegisterRGBAImage(int type, const wxString& pixels)
-{
-    SendMsg(2627, type, (sptr_t)(const char*)wx2stc(pixels));
+void wxStyledTextCtrl::RegisterRGBAImage(int type, const unsigned char* pixels) {
+           SendMsg(2627, type, (sptr_t)pixels);

 }
 
 // Scroll to start of document.
 }
 
 // Scroll to start of document.


@@ -3976,27 +3982,8 @@ int wxStyledTextCtrl::GetTechnology() const
 }
 
 // Create an ILoader*.
 }
 
 // Create an ILoader*.

-int wxStyledTextCtrl::CreateLoader(int bytes)
-{
-    return SendMsg(2632, bytes, 0);
-}
-
-// On OS X, show a find indicator.
-void wxStyledTextCtrl::FindIndicatorShow(int start, int end)
-{
-    SendMsg(2640, start, end);
-}
-
-// On OS X, flash a find indicator, then fade out.
-void wxStyledTextCtrl::FindIndicatorFlash(int start, int end)
-{
-    SendMsg(2641, start, end);
-}
-
-// On OS X, hide the find indicator.
-void wxStyledTextCtrl::FindIndicatorHide()
-{
-    SendMsg(2642, 0, 0);
+void* wxStyledTextCtrl::CreateLoader(int bytes) const {
+         return (void*)(sptr_t)SendMsg(2632, bytes); 

 }
 
 // Start notifying the container of all key presses and commands.
 }
 
 // Start notifying the container of all key presses and commands.


@@ -4088,20 +4075,19 @@ int wxStyledTextCtrl::GetStyleBitsNeeded() const
 }
 
 // For private communication between an application and a known lexer.
 }
 
 // For private communication between an application and a known lexer.

-int wxStyledTextCtrl::PrivateLexerCall(int operation, int pointer)
-{
-    return SendMsg(4013, operation, pointer);
+void* wxStyledTextCtrl::PrivateLexerCall(int operation, void* pointer) {
+           return (void*)(sptr_t)SendMsg(4013, operation, (sptr_t)pointer); 

 }
 
 // Retrieve a '\n' separated list of properties understood by the current lexer.
 wxString wxStyledTextCtrl::PropertyNames() const {
          int msg = 4014;
 }
 
 // Retrieve a '\n' separated list of properties understood by the current lexer.
 wxString wxStyledTextCtrl::PropertyNames() const {
          int msg = 4014;

-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(msg, (sptr_t)buf);
+         SendMsg(msg, 0, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);


@@ -4116,7 +4102,7 @@ int wxStyledTextCtrl::PropertyType(const wxString& name)
 // Describe a property.
 wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
          int msg = 4016;
 // Describe a property.
 wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
          int msg = 4016;

-         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), NULL);
+         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -4130,12 +4116,12 @@ wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
 // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
 wxString wxStyledTextCtrl::DescribeKeyWordSets() const {
          int msg = 4017;
 // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
 wxString wxStyledTextCtrl::DescribeKeyWordSets() const {
          int msg = 4017;

-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          char* buf = (char*)mbuf.GetWriteBuf(len+1);

-         SendMsg(msg, (sptr_t)buf);
+         SendMsg(msg, 0, (sptr_t)buf);

          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);
          mbuf.UngetWriteBuf(len);
          mbuf.AppendByte(0);
          return stc2wx(buf);


@@ -4394,58 +4380,114 @@ void wxStyledTextCtrl::ScrollToColumn(int column) {
 }
 
 
 }
 
 

-#if wxUSE_TEXTCTRL
-bool wxStyledTextCtrl::DoSaveFile(const wxString& filename, int fileType)
+void wxStyledTextCtrl::DoSetValue(const wxString& value, int flags)

 {
 {

-   bool ok = wxTextAreaBase::DoSaveFile(filename, fileType);
-#else
-bool wxStyledTextCtrl::SaveFile(const wxString& filename)
+    if ( flags & SetValue_SelectionOnly )
+        ReplaceSelection(value);
+    else
+        SetText(value);
+
+    // We don't send wxEVT_COMMAND_TEXT_UPDATED anyhow, so ignore the
+    // SetValue_SendEvent bit of the flags
+}
+
+bool
+wxStyledTextCtrl::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))

 {
 {

+#if wxUSE_FFILE || wxUSE_FILE
+

 #if wxUSE_FFILE
 #if wxUSE_FFILE

-    wxFFile file(filename, wxT("w"));
-    bool ok = file.IsOpened() && file.Write(GetValue(), *wxConvCurrent);
-#else
-    bool ok = false;
-#endif // wxUSE_FFILE
+    // Take care to use "b" to ensure that possibly non-native EOLs in the file
+    // contents are not mangled when saving it.
+    wxFFile file(filename, wxS("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);

 #endif
 #endif

-    if (ok)
+
+    if ( file.IsOpened() && file.Write(GetValue(), *wxConvCurrent) )

     {
         SetSavePoint();
     {
         SetSavePoint();

+
+        return true;

     }
     }

-    return ok;
+
+#endif // !wxUSE_FFILE && !wxUSE_FILE
+
+    return false;

 }
 
 }
 

-#if wxUSE_TEXTCTRL
-bool wxStyledTextCtrl::DoLoadFile(const wxString& filename, int fileType)
-{
-   bool ok = wxTextAreaBase::DoLoadFile(filename, fileType);
-#else
-bool wxStyledTextCtrl::LoadFile(const wxString& filename)
+bool
+wxStyledTextCtrl::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))

 {
 {

+#if wxUSE_FFILE || wxUSE_FILE
+

 #if wxUSE_FFILE
 #if wxUSE_FFILE

-    wxFFile file(filename);
-    bool ok = file.IsOpened();
-    if (ok)
+    // As above, we want to read the real EOLs from the file, e.g. without
+    // translating them to just LFs under Windows, so that the original CR LF
+    // are preserved when it's written back.
+    wxFFile file(filename, wxS("rb"));
+#else
+    wxFile file(filename);
+#endif
+
+    if ( file.IsOpened() )

     {
         wxString text;
     {
         wxString text;

-        ok = file.ReadAll(&text, *wxConvCurrent);
-        if (ok)
+        if ( file.ReadAll(&text, *wxConvCurrent) )

         {
         {

+            // 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
+            // need to ask the user about the one we should really use and we
+            // don't currently provide a way to do it.
+            //
+            // We also only check for Unix and DOS EOLs but not classic Mac
+            // CR-only one as it's obsolete by now.
+            const wxString::size_type posLF = text.find('\n');
+            if ( posLF != wxString::npos )
+            {
+                // Set EOL mode to ensure that the new lines inserted into the
+                // text use the same EOLs as the existing ones.
+                if ( posLF > 0 && text[posLF - 1] == '\r' )
+                    SetEOLMode(wxSTC_EOL_CRLF);
+                else
+                    SetEOLMode(wxSTC_EOL_LF);
+            }
+            //else: Use the default EOL for the current platform.
+

             SetValue(text);
             SetValue(text);

+            EmptyUndoBuffer();
+            SetSavePoint();
+
+            return true;

         }
     }
         }
     }

-#else
-    bool ok = false;
-#endif // wxUSE_FFILE
-#endif
-   if (ok)
-   {
-       EmptyUndoBuffer();
-       SetSavePoint();
-   }
-   return ok;
+#endif // !wxUSE_FFILE && !wxUSE_FILE
+
+   return false;
+}
+
+// If we don't derive from wxTextAreaBase, we need to implement these methods
+// ourselves, otherwise we already inherit them.
+#if !wxUSE_TEXTCTRL
+
+bool wxStyledTextCtrl::SaveFile(const wxString& filename)
+{
+    if ( filename.empty() )
+        return false;
+
+    return DoSaveFile(filename, wxTEXT_TYPE_ANY);

 }
 
 }
 

+bool wxStyledTextCtrl::LoadFile(const wxString& filename)
+{
+    if ( filename.empty() )
+        return false;
+
+    return DoLoadFile(filename, wxTEXT_TYPE_ANY);
+}
+
+#endif // !wxUSE_TEXTCTRL
+

 #if wxUSE_DRAG_AND_DROP
 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
         return m_swx->DoDragOver(x, y, def);
 #if wxUSE_DRAG_AND_DROP
 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
         return m_swx->DoDragOver(x, y, def);


@@ -4466,6 +4508,9 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() {
     return m_swx->GetUseAntiAliasing();
 }
 
     return m_swx->GetUseAntiAliasing();
 }
 

+void wxStyledTextCtrl::AnnotationClearLine(int line) {
+    SendMsg(SCI_ANNOTATIONSETTEXT, line, (sptr_t)NULL);
+}

 
 
 
 
 
 


@@ -4571,7 +4616,11 @@ void wxStyledTextCtrl::AppendTextRaw(const char* text, int length)
 // Event handlers
 
 void wxStyledTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) {
 // Event handlers
 
 void wxStyledTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) {

+#ifdef __WXGTK__
+    wxBufferedPaintDC dc(this);
+#else

     wxPaintDC dc(this);
     wxPaintDC dc(this);

+#endif

     m_swx->DoPaint(&dc, GetUpdateRegion().GetBox());
 }
 
     m_swx->DoPaint(&dc, GetUpdateRegion().GetBox());
 }
 


@@ -4815,10 +4864,12 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
 
     case SCN_DOUBLECLICK:
         evt.SetEventType(wxEVT_STC_DOUBLECLICK);
 
     case SCN_DOUBLECLICK:
         evt.SetEventType(wxEVT_STC_DOUBLECLICK);

+        evt.SetLine(scn.line);

         break;
 
     case SCN_UPDATEUI:
         evt.SetEventType(wxEVT_STC_UPDATEUI);
         break;
 
     case SCN_UPDATEUI:
         evt.SetEventType(wxEVT_STC_UPDATEUI);

+        evt.SetUpdated(scn.updated);

         break;
 
     case SCN_MODIFIED:
         break;
 
     case SCN_MODIFIED:


@@ -4830,6 +4881,8 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetLine(scn.line);
         evt.SetFoldLevelNow(scn.foldLevelNow);
         evt.SetFoldLevelPrev(scn.foldLevelPrev);
         evt.SetLine(scn.line);
         evt.SetFoldLevelNow(scn.foldLevelNow);
         evt.SetFoldLevelPrev(scn.foldLevelPrev);

+        evt.SetToken(scn.token);
+        evt.SetAnnotationLinesAdded(scn.annotationLinesAdded);

         break;
 
     case SCN_MACRORECORD:
         break;
 
     case SCN_MACRORECORD:


@@ -4916,6 +4969,10 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_AUTOCOMP_CHAR_DELETED);
         break;
 
         evt.SetEventType(wxEVT_STC_AUTOCOMP_CHAR_DELETED);
         break;
 

+    case SCN_HOTSPOTRELEASECLICK:
+        evt.SetEventType(wxEVT_STC_HOTSPOT_RELEASE_CLICK);
+        break;
+

     default:
         return;
     }
     default:
         return;
     }


@@ -4947,6 +5004,10 @@ 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_token = 0;
+    m_annotationLinesAdded = 0;
+    m_updated = 0;
+

 #if wxUSE_DRAG_AND_DROP
     m_dragFlags = wxDrag_CopyOnly;
     m_dragResult = wxDragNone;
 #if wxUSE_DRAG_AND_DROP
     m_dragFlags = wxDrag_CopyOnly;
     m_dragResult = wxDragNone;


@@ -4982,6 +5043,10 @@ 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_token =        event.m_token;
+    m_annotationLinesAdded = event.m_annotationLinesAdded;
+    m_updated =      event.m_updated;
+

 #if wxUSE_DRAG_AND_DROP
     m_dragText =     event.m_dragText;
     m_dragFlags =    event.m_dragFlags;
 #if wxUSE_DRAG_AND_DROP
     m_dragText =     event.m_dragText;
     m_dragFlags =    event.m_dragFlags;


@@ -4994,7 +5059,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 
 /*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
 {
 
 /*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
 {

-    return wxVersionInfo("Scintilla", 2, 3, 0, "Scintilla 2.03");
+    return wxVersionInfo("Scintilla", 3, 21, 0, "Scintilla 3.21");

 }
 
 #endif // wxUSE_STC
 }
 
 #endif // wxUSE_STC