Update new names to conform, add new event types and event attributes, etc.

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

include/wx/stc/stc.h

@@ -56,7 +56,6 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #endif
 #endif
 
-
 //----------------------------------------------------------------------
 // STC constants generated section {{{
 
@@ -2462,6 +2461,21 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 // Move caret right one word, position cursor at end of word, extending selection to new caret position.
 #define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
 
+// Centre current line in window.
+#define wxSTC_CMD_VERTICALCENTRECARET 2619
+
+// Move the selected lines up one line, shifting the line above after the selection
+#define wxSTC_CMD_MOVESELECTEDLINESUP 2620
+
+// Move the selected lines down one line, shifting the line below before the selection
+#define wxSTC_CMD_MOVESELECTEDLINESDOWN 2621
+
+// Scroll to start of document.
+#define wxSTC_CMD_SCROLLTOSTART 2628
+
+// Scroll to end of document.
+#define wxSTC_CMD_SCROLLTOEND 2629
+
 //}}}
 //----------------------------------------------------------------------
 
@@ -2659,7 +2673,7 @@ public:
     void MarkerSetBackground(int markerNumber, const wxColour& back);
 
     // Set the background colour used for a particular marker number when its folding block is selected.
-    void MarkerSetBackSelected(int markerNumber, const wxColour& back);
+    void MarkerSetBackgroundSelected(int markerNumber, const wxColour& back);
 
     // Enable/disable highlight for current folding bloc (smallest one that contains the caret)
     void MarkerEnableHighlight(bool enabled);
@@ -2717,10 +2731,10 @@ public:
     bool GetMarginSensitive(int margin) const;
 
     // Set the cursor shown when the mouse is inside a margin.
-    void SetMarginCursorN(int margin, int cursor);
+    void SetMarginCursor(int margin, int cursor);
 
     // Retrieve the cursor shown in a margin.
-    int GetMarginCursorN(int margin) const;
+    int GetMarginCursor(int margin) const;
 
     // Clear all the styles and make equivalent to the global default style.
     void StyleClearAll();
@@ -3953,10 +3967,10 @@ public:
     int AutoCompGetCurrent() const;
 
     // Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.
-    void AutoCSetCaseInsensitiveBehaviour(int behaviour);
+    void AutoCompSetCaseInsensitiveBehaviour(int behaviour);
 
     // Get auto-completion case insensitive behaviour.
-    int AutoCGetCaseInsensitiveBehaviour() const;
+    int AutoCompGetCaseInsensitiveBehaviour() const;
 
     // Enlarge the document to a particular size of text bytes.
     void Allocate(int bytes);
@@ -4036,12 +4050,12 @@ public:
 
     // Compact the document buffer and return a read-only pointer to the
     // characters in the document.
-    const char* GetCharacterPointer();
+    const char* GetCharacterPointer() const;
 
     // 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 GetRangePointer(int position, int rangeLength) const;
+    const char* GetRangePointer(int position, int rangeLength) const;
 
     // Return a position which, to avoid performance costs, should not be within
     // the range of a call to GetRangePointer.
@@ -4060,10 +4074,10 @@ public:
     int IndicatorGetAlpha(int indicator) const;
 
     // Set the alpha outline colour of the given indicator.
-    void IndicSetOutlineAlpha(int indicator, int alpha);
+    void IndicatorSetOutlineAlpha(int indicator, int alpha);
 
     // Get the alpha outline colour of the given indicator.
-    int IndicGetOutlineAlpha(int indicator) const;
+    int IndicatorGetOutlineAlpha(int indicator) const;
 
     // Set extra ascent for each line
     void SetExtraAscent(int extraAscent);
@@ -4294,11 +4308,11 @@ public:
 
     // Define a marker from RGBA data.
     // It has the width and height from RGBAImageSetWidth/Height
-    void MarkerDefineRGBAImage(int markerNumber, const wxString& pixels);
+    void MarkerDefineRGBAImage(int markerNumber, const unsigned char* pixels);
 
     // Register an RGBA image for use in autocompletion lists.
     // It has the width and height from RGBAImageSetWidth/Height
-    void RegisterRGBAImage(int type, const wxString& pixels);
+    void RegisterRGBAImage(int type, const unsigned char* pixels);
 
     // Scroll to start of document.
     void ScrollToStart();
@@ -4313,16 +4327,7 @@ public:
     int GetTechnology() const;
 
     // Create an ILoader*.
-    int CreateLoader(int bytes);
+    void* CreateLoader(int bytes) const;
-
-    // On OS X, show a find indicator.
-    void FindIndicatorShow(int start, int end);
-
-    // On OS X, flash a find indicator, then fade out.
-    void FindIndicatorFlash(int start, int end);
-
-    // On OS X, hide the find indicator.
-    void FindIndicatorHide();
 
     // Start notifying the container of all key presses and commands.
     void StartRecord();
@@ -4363,7 +4368,7 @@ public:
     int GetStyleBitsNeeded() const;
 
     // For private communication between an application and a known lexer.
-    int PrivateLexerCall(int operation, int pointer);
+    void* PrivateLexerCall(int operation, void* pointer);
 
     // Retrieve a '\n' separated list of properties understood by the current lexer.
     wxString PropertyNames() const;
@@ -4773,6 +4778,9 @@ public:
     void SetListType(int val)             { m_listType = val; }
     void SetX(int val)                    { m_x = val; }
     void SetY(int val)                    { m_y = val; }
+    void SetToken(int val)                { m_token = val; }
+    void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; }
+    void SetUpdated(int val)              { m_updated = val; }
 #ifdef  STC_USE_DND
     void SetDragText(const wxString& val) { m_dragText = val; }
     void SetDragFlags(int flags)          { m_dragFlags = flags; }
@@ -4806,6 +4814,10 @@ public:
     int  GetListType() const         { return m_listType; }
     int  GetX() const                { return m_x; }
     int  GetY() const                { return m_y; }
+    int  GetToken() const                 { return m_token; }
+    int  GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
+    int  GetUpdated() const               { return m_updated; }
+    
 #ifdef STC_USE_DND
     wxString GetDragText()           { return m_dragText; }
     int GetDragFlags()               { return m_dragFlags; }
@@ -4846,6 +4858,11 @@ private:
     int m_x;
     int m_y;
 
+    int m_token;                /* wxEVT_STC__MODIFIED with SC_MOD_CONTAINER */
+    int m_annotationLinesAdded; /* wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION */
+    int m_updated;              // wxEVT_STC_UPDATEUI
+
+
 #if wxUSE_DRAG_AND_DROP
     wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
     int      m_dragFlags;       // wxEVT_STC_START_DRAG
@@ -4887,6 +4904,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_CLICK, wxStyledTe
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );
 #else
     enum {
         wxEVT_STC_CHANGE,
@@ -4918,7 +4936,8 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxSt
         wxEVT_STC_INDICATOR_CLICK,
         wxEVT_STC_INDICATOR_RELEASE,
         wxEVT_STC_AUTOCOMP_CANCELLED,
-        wxEVT_STC_AUTOCOMP_CHAR_DELETED
+        wxEVT_STC_AUTOCOMP_CHAR_DELETED,
+        wxEVT_STC_HOTSPOT_RELEASE_CLICK
     };
 #endif
 
@@ -4960,6 +4979,7 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_INDICATOR_RELEASE(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CANCELLED(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CANCELLED,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CHAR_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CHAR_DELETED, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_HOTSPOT_RELEASE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_RELEASE_CLICK, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 
 #endif
 

src/stc/gen_iface.py

@@ -52,6 +52,8 @@ cmdValues = [ 2011,
               (2426, 2442),
               (2450, 2455),
               2518,
+              (2619, 2621),
+              (2628, 2629)
             ]
 
 
@@ -180,6 +182,7 @@ methodOverrideMap = {
 
     'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
     'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
+    'MarkerSetBackSelected' : ('MarkerSetBackgroundSelected', 0,0,0),
 
     'MarkerSymbolDefined' : ('GetMarkerSymbolDefined', 0, 0, 0),
 
@@ -231,6 +234,8 @@ methodOverrideMap = {
     'GetMarginMaskN' : ('GetMarginMask', 0, 0, 0),
     'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0),
     'GetMarginSensitiveN' : ('GetMarginSensitive', 0, 0, 0),
+    'SetMarginCursorN' : ('SetMarginCursor', 0, 0, 0),
+    'GetMarginCursorN' : ('GetMarginCursor', 0, 0, 0),
     
     'MarginGetText' :
     (0,
@@ -355,6 +360,8 @@ methodOverrideMap = {
 
     'IndicSetAlpha' : ('IndicatorSetAlpha', 0, 0, 0),
     'IndicGetAlpha' : ('IndicatorGetAlpha', 0, 0, 0),
+    'IndicSetOutlineAlpha' : ('IndicatorSetOutlineAlpha', 0, 0, 0),
+    'IndicGetOutlineAlpha' : ('IndicatorGetOutlineAlpha', 0, 0, 0),
     'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0),
     'IndicGetStyle' : ('IndicatorGetStyle', 0, 0, 0),
     'IndicSetFore' : ('IndicatorSetForeground', 0, 0, 0),
@@ -394,6 +401,8 @@ methodOverrideMap = {
     'AutoCSetMaxHeight'     : ('AutoCompSetMaxHeight', 0, 0, 0),
     'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
     'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
+    'AutoCSetCaseInsensitiveBehaviour'     : ('AutoCompSetCaseInsensitiveBehaviour', 0, 0, 0),
+    'AutoCGetCaseInsensitiveBehaviour'     : ('AutoCompGetCaseInsensitiveBehaviour', 0, 0, 0),
 
     'RegisterImage' :
     (0,
@@ -729,11 +738,17 @@ methodOverrideMap = {
     'SetSelection' : (None, 0, 0, 0),
 
     'GetCharacterPointer' : (0,
-                             'const char* %s();',
+                             'const char* %s() const;',
-                             'const char* %s() {\n'
+                             'const char* %s() const {\n'
                              '    return (const char*)SendMsg(%s, 0, 0);',
                              0),
     
+    'GetRangePointer' : (0,
+                             'const char* %s(int position, int rangeLength) const;',
+                             'const char* %s(int position, int rangeLength) const {\n'
+                             '    return (const char*)SendMsg(%s, position, rangeLength);',
+                             0),
+    
 
     'GetWordChars' :
     (0,
@@ -741,12 +756,12 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);''',
@@ -776,12 +791,12 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);''',
@@ -794,12 +809,12 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);''',
@@ -812,12 +827,12 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);''',
@@ -850,18 +865,53 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);''',
      0),
      
 
+    'MarkerDefineRGBAImage' :
+    (0,
+    'void %s(int markerNumber, const unsigned char* pixels);',
+    '''void %s(int markerNumber, const unsigned char* pixels) {
+           SendMsg(%s, markerNumber, (sptr_t)pixels);''',
+    0),
+
+
+    'RegisterRGBAImage' :
+    (0,
+    'void %s(int type, const unsigned char* pixels);',
+    '''void %s(int type, const unsigned char* pixels) {
+           SendMsg(%s, type, (sptr_t)pixels);''',
+    0),
+
+
+    # I think these are only available on the native OSX backend, so
+    # don't add them to the wx API...
+    'FindIndicatorShow' : (None, 0,0,0),
+    'FindIndicatorFlash' : (None, 0,0,0),
+    'FindIndicatorHide' : (None, 0,0,0),
+
+    'CreateLoader' :
+    (0,
+     'void* %s(int bytes) const;',
+     """void* %s(int bytes) const {
+         return (void*)(sptr_t)SendMsg(%s, bytes); """,
+     0),
+
+     'PrivateLexerCall' :
+     (0,
+      'void* %s(int operation, void* pointer);',
+      """void* %s(int operation, void* pointer) {
+           return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer); """,
+      0),
     
     '' : ('', 0, 0, 0),
 

src/stc/stc.cpp

@@ -126,6 +126,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_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );
 
 
 
@@ -551,7 +552,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.
-void wxStyledTextCtrl::MarkerSetBackSelected(int markerNumber, const wxColour& back)
+void wxStyledTextCtrl::MarkerSetBackgroundSelected(int markerNumber, const wxColour& back)
 {
     SendMsg(2292, markerNumber, wxColourAsLong(back));
 }
@@ -677,13 +678,13 @@ bool wxStyledTextCtrl::GetMarginSensitive(int margin) const
 }
 
 // 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.
-int wxStyledTextCtrl::GetMarginCursorN(int margin) const
+int wxStyledTextCtrl::GetMarginCursor(int margin) const
 {
     return SendMsg(2249, margin, 0);
 }
@@ -962,12 +963,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;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);
@@ -3162,12 +3163,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;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);
@@ -3183,12 +3184,12 @@ void wxStyledTextCtrl::SetPunctuationChars(const wxString& characters)
 // 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, NULL);
          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);
@@ -3207,13 +3208,13 @@ int wxStyledTextCtrl::AutoCompGetCurrent() const
 }
 
 // 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.
-int wxStyledTextCtrl::AutoCGetCaseInsensitiveBehaviour() const
+int wxStyledTextCtrl::AutoCompGetCaseInsensitiveBehaviour() const
 {
     return SendMsg(2635, 0, 0);
 }
@@ -3371,16 +3372,15 @@ void wxStyledTextCtrl::CopyAllowLine()
 
 // 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.
-int wxStyledTextCtrl::GetRangePointer(int position, int rangeLength) const
+const char* wxStyledTextCtrl::GetRangePointer(int position, int rangeLength) const {
-{
+    return (const char*)SendMsg(2643, position, rangeLength);
-    return SendMsg(2643, position, rangeLength);
 }
 
 // Return a position which, to avoid performance costs, should not be within
@@ -3415,13 +3415,13 @@ int wxStyledTextCtrl::IndicatorGetAlpha(int indicator) const
 }
 
 // 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.
-int wxStyledTextCtrl::IndicGetOutlineAlpha(int indicator) const
+int wxStyledTextCtrl::IndicatorGetOutlineAlpha(int indicator) const
 {
     return SendMsg(2559, indicator, 0);
 }
@@ -3939,16 +3939,14 @@ void wxStyledTextCtrl::RGBAImageSetHeight(int height)
 
 // Define a marker from RGBA data.
 // It has the width and height from RGBAImageSetWidth/Height
-void wxStyledTextCtrl::MarkerDefineRGBAImage(int markerNumber, const wxString& pixels)
+void wxStyledTextCtrl::MarkerDefineRGBAImage(int markerNumber, const unsigned char* pixels) {
-{
+           SendMsg(2626, markerNumber, (sptr_t)pixels);
-    SendMsg(2626, markerNumber, (sptr_t)(const char*)wx2stc(pixels));
 }
 
 // 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)
+void wxStyledTextCtrl::RegisterRGBAImage(int type, const unsigned char* pixels) {
-{
+           SendMsg(2627, type, (sptr_t)pixels);
-    SendMsg(2627, type, (sptr_t)(const char*)wx2stc(pixels));
 }
 
 // Scroll to start of document.
@@ -3976,27 +3974,8 @@ int wxStyledTextCtrl::GetTechnology() const
 }
 
 // Create an ILoader*.
-int wxStyledTextCtrl::CreateLoader(int bytes)
+void* wxStyledTextCtrl::CreateLoader(int bytes) const {
-{
+         return (void*)(sptr_t)SendMsg(2632, 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);
 }
 
 // Start notifying the container of all key presses and commands.
@@ -4088,20 +4067,19 @@ int wxStyledTextCtrl::GetStyleBitsNeeded() const
 }
 
 // For private communication between an application and a known lexer.
-int wxStyledTextCtrl::PrivateLexerCall(int operation, int pointer)
+void* wxStyledTextCtrl::PrivateLexerCall(int operation, void* pointer) {
-{
+           return (void*)(sptr_t)SendMsg(4013, operation, (sptr_t)pointer); 
-    return SendMsg(4013, operation, pointer);
 }
 
 // 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, NULL);
          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);
@@ -4130,12 +4108,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;
-         int len = SendMsg(msg, NULL);
+         int len = SendMsg(msg, 0, NULL);
          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);
@@ -4815,10 +4793,12 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
 
     case SCN_DOUBLECLICK:
         evt.SetEventType(wxEVT_STC_DOUBLECLICK);
+        evt.SetLine(scn.line);
         break;
 
     case SCN_UPDATEUI:
         evt.SetEventType(wxEVT_STC_UPDATEUI);
+        evt.SetUpdated(scn.updated);
         break;
 
     case SCN_MODIFIED:
@@ -4830,6 +4810,8 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetLine(scn.line);
         evt.SetFoldLevelNow(scn.foldLevelNow);
         evt.SetFoldLevelPrev(scn.foldLevelPrev);
+        evt.SetToken(scn.token);
+        evt.SetAnnotationLinesAdded(scn.annotationLinesAdded);
         break;
 
     case SCN_MACRORECORD:
@@ -4916,6 +4898,10 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_AUTOCOMP_CHAR_DELETED);
         break;
 
+    case SCN_HOTSPOTRELEASECLICK:
+        evt.SetEventType(wxEVT_STC_HOTSPOT_RELEASE_CLICK);
+        break;
+
     default:
         return;
     }

src/stc/stc.cpp.in

@@ -126,6 +126,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_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );
 
 
 
@@ -930,10 +931,12 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
 
     case SCN_DOUBLECLICK:
         evt.SetEventType(wxEVT_STC_DOUBLECLICK);
+        evt.SetLine(scn.line);
         break;
 
     case SCN_UPDATEUI:
         evt.SetEventType(wxEVT_STC_UPDATEUI);
+        evt.SetUpdated(scn.updated);
         break;
 
     case SCN_MODIFIED:
@@ -945,6 +948,8 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetLine(scn.line);
         evt.SetFoldLevelNow(scn.foldLevelNow);
         evt.SetFoldLevelPrev(scn.foldLevelPrev);
+        evt.SetToken(scn.token);
+        evt.SetAnnotationLinesAdded(scn.annotationLinesAdded);
         break;
 
     case SCN_MACRORECORD:
@@ -1031,6 +1036,10 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_AUTOCOMP_CHAR_DELETED);
         break;
 
+    case SCN_HOTSPOTRELEASECLICK:
+        evt.SetEventType(wxEVT_STC_HOTSPOT_RELEASE_CLICK);
+        break;
+
     default:
         return;
     }

src/stc/stc.h.in

@@ -56,7 +56,6 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #endif
 #endif
 
-
 //----------------------------------------------------------------------
 // STC constants generated section {{{
 
@@ -521,6 +520,9 @@ public:
     void SetListType(int val)             { m_listType = val; }
     void SetX(int val)                    { m_x = val; }
     void SetY(int val)                    { m_y = val; }
+    void SetToken(int val)                { m_token = val; }
+    void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; }
+    void SetUpdated(int val)              { m_updated = val; }
 #ifdef  STC_USE_DND
     void SetDragText(const wxString& val) { m_dragText = val; }
     void SetDragFlags(int flags)          { m_dragFlags = flags; }
@@ -554,6 +556,10 @@ public:
     int  GetListType() const         { return m_listType; }
     int  GetX() const                { return m_x; }
     int  GetY() const                { return m_y; }
+    int  GetToken() const                 { return m_token; }
+    int  GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
+    int  GetUpdated() const               { return m_updated; }
+    
 #ifdef STC_USE_DND
     wxString GetDragText()           { return m_dragText; }
     int GetDragFlags()               { return m_dragFlags; }
@@ -594,6 +600,11 @@ private:
     int m_x;
     int m_y;
 
+    int m_token;		/* wxEVT_STC__MODIFIED with SC_MOD_CONTAINER */
+    int m_annotationLinesAdded;	/* wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION */
+    int m_updated;              // wxEVT_STC_UPDATEUI
+
+
 #if wxUSE_DRAG_AND_DROP
     wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
     int      m_dragFlags;       // wxEVT_STC_START_DRAG
@@ -635,6 +646,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_CLICK, wxStyledTe
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );
 #else
     enum {
         wxEVT_STC_CHANGE,
@@ -666,7 +678,8 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxSt
         wxEVT_STC_INDICATOR_CLICK,
         wxEVT_STC_INDICATOR_RELEASE,
         wxEVT_STC_AUTOCOMP_CANCELLED,
-        wxEVT_STC_AUTOCOMP_CHAR_DELETED
+        wxEVT_STC_AUTOCOMP_CHAR_DELETED,
+        wxEVT_STC_HOTSPOT_RELEASE_CLICK
     };
 #endif
 
@@ -708,6 +721,7 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_INDICATOR_RELEASE(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CANCELLED(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CANCELLED,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CHAR_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CHAR_DELETED, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_HOTSPOT_RELEASE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_RELEASE_CLICK, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 
 #endif