Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-08-14 05:55:23 +00:00
parent 65d6e39ba3
commit d01ca1e4d1
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/stc/stc.h
View File

@@ -4858,8 +4858,8 @@ private:
int m_x; int m_x;
int m_y; int m_y;
int m_token; /* wxEVT_STC__MODIFIED with SC_MOD_CONTAINER */ int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
int m_annotationLinesAdded; /* wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION */ int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
int m_updated; // wxEVT_STC_UPDATEUI int m_updated; // wxEVT_STC_UPDATEUI

10
src/stc/stc.cpp
View File

@@ -4933,6 +4933,10 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_listType = 0; m_listType = 0;
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
m_token = 0;
m_annotationLinesAdded = 0;
m_updated = 0;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_dragFlags = wxDrag_CopyOnly; m_dragFlags = wxDrag_CopyOnly;
m_dragResult = wxDragNone; m_dragResult = wxDragNone;
@@ -4968,6 +4972,10 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_x = event.m_x; m_x = event.m_x;
m_y = event.m_y; 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 #if wxUSE_DRAG_AND_DROP
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragFlags = event.m_dragFlags; 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

10
src/stc/stc.cpp.in
View File

@@ -1071,6 +1071,10 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_listType = 0; m_listType = 0;
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
m_token = 0;
m_annotationLinesAdded = 0;
m_updated = 0;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_dragFlags = wxDrag_CopyOnly; m_dragFlags = wxDrag_CopyOnly;
m_dragResult = wxDragNone; m_dragResult = wxDragNone;
@@ -1106,6 +1110,10 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_x = event.m_x; m_x = event.m_x;
m_y = event.m_y; 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 #if wxUSE_DRAG_AND_DROP
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragFlags = event.m_dragFlags; 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

4
src/stc/stc.h.in
View File

@@ -600,8 +600,8 @@ private:
int m_x; int m_x;
int m_y; int m_y;
int m_token; /* wxEVT_STC__MODIFIED with SC_MOD_CONTAINER */ int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
int m_annotationLinesAdded; /* wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION */ int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
int m_updated; // wxEVT_STC_UPDATEUI int m_updated; // wxEVT_STC_UPDATEUI