Update the wxVersionInfo, and don't forget to initialize the new attributes of the...

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

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index a1a3aae44a5ed210b79d5d2f2d04bac9cb0cec49..886e597cf0c765c4f774435efe13edba0db17701 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -4858,8 +4858,8 @@ private:
     int m_x;
     int m_y;
 
     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_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
+    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION

     int m_updated;              // wxEVT_STC_UPDATEUI
 
 
     int m_updated;              // wxEVT_STC_UPDATEUI
 
 

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 3b5561be8b3802efe9f75a78574211b89a60ad18..bb3320188c93eb67a1c0f09755a79fb153593376 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -4933,6 +4933,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;


@@ -4968,6 +4972,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;


@@ -4980,7 +4988,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

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 87f83f799300b669168a019493077b36d92c313a..0313d2dae2bf0e1b8b947aa30d2040572aa0e122 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -1071,6 +1071,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;


@@ -1106,6 +1110,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;


@@ -1118,7 +1126,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

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index ca1a9fa9960d43730acda7b19ee984820bb89a29..bfe4f0d49e15fa2bc466a1cd456daf6a1d3033fe 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -600,8 +600,8 @@ private:
     int m_x;
     int m_y;
 
     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_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER 
+    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION 

     int m_updated;              // wxEVT_STC_UPDATEUI
 
 
     int m_updated;              // wxEVT_STC_UPDATEUI