AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add wxStyledTextEvent::GetListCompletionMethod()

Browse Source 
Provide access to Scintilla "listCompletionMethod" field of SCR_AUTOCSELECTION
event.

Closes #17648.
This commit is contained in:
New Pagodi 2016-09-13 13:05:25 +02:00 committed by Vadim Zeitlin
parent b05ea5f8f4
commit b99d28bb46
7 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -103,6 +103,7 @@ All (GUI):
- Fix wxGCDC::GetClippingBox() for transformed wxDC (MSW, GTK+).
- Add support for affine transformation matrix in wxGCDC.
- Add wxGraphicsContext::Flush() for Cairo renderer.
- Add wxStyledTextEvent::GetListCompletionMethod() (NewPagodi).
wxGTK:

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

@ -5302,6 +5302,7 @@ public:
void SetToken(int val) { m_token = val; }
void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; }
void SetUpdated(int val) { m_updated = val; }
void SetListCompletionMethod(int val) { m_listCompletionMethod = val; }
#ifdef STC_USE_DND
// Kept for backwards compatibility, use SetString().
void SetDragText(const wxString& val) { SetString(val); }
@ -5340,6 +5341,7 @@ public:
int GetToken() const { return m_token; }
int GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
int GetUpdated() const { return m_updated; }
int GetListCompletionMethod() const { return m_listCompletionMethod; }
#ifdef STC_USE_DND
// Kept for backwards compatibility, use GetString().
@ -5384,6 +5386,7 @@ private:
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_listCompletionMethod;
#if wxUSE_DRAG_AND_DROP
int m_dragFlags; // wxEVT_STC_START_DRAG

2
interface/wx/stc/stc.h
View File

@ -6470,6 +6470,7 @@ public:
void SetToken(int val);
void SetAnnotationLinesAdded(int val);
void SetUpdated(int val);
void SetListCompletionMethod(int val);
void SetDragText(const wxString& val);
void SetDragFlags(int flags);
void SetDragResult(wxDragResult val);
@ -6497,6 +6498,7 @@ public:
int GetToken() const;
int GetAnnotationsLinesAdded() const;
int GetUpdated() const;
int GetListCompletionMethod() const;
/**
@deprecated Use GetString() instead.

4
src/stc/stc.cpp
View File

@ -5368,6 +5368,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
evt.SetListType(scn.listType);
SetEventText(evt, scn.text, strlen(scn.text));
evt.SetPosition(scn.lParam);
evt.SetListCompletionMethod(scn.listCompletionMethod);
break;
case SCN_USERLISTSELECTION:
@ -5375,6 +5376,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
evt.SetListType(scn.listType);
SetEventText(evt, scn.text, strlen(scn.text));
evt.SetPosition(scn.lParam);
evt.SetListCompletionMethod(scn.listCompletionMethod);
break;
case SCN_URIDROPPED:
@ -5464,6 +5466,7 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_token = 0;
m_annotationLinesAdded = 0;
m_updated = 0;
m_listCompletionMethod = 0;
#if wxUSE_DRAG_AND_DROP
m_dragFlags = wxDrag_CopyOnly;
@ -5502,6 +5505,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_token = event.m_token;
m_annotationLinesAdded = event.m_annotationLinesAdded;
m_updated = event.m_updated;
m_listCompletionMethod = event.m_listCompletionMethod;
#if wxUSE_DRAG_AND_DROP
m_dragFlags = event.m_dragFlags;

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

@ -1074,6 +1074,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
evt.SetListType(scn.listType);
SetEventText(evt, scn.text, strlen(scn.text));
evt.SetPosition(scn.lParam);
evt.SetListCompletionMethod(scn.listCompletionMethod);
break;
case SCN_USERLISTSELECTION:
@ -1081,6 +1082,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
evt.SetListType(scn.listType);
SetEventText(evt, scn.text, strlen(scn.text));
evt.SetPosition(scn.lParam);
evt.SetListCompletionMethod(scn.listCompletionMethod);
break;
case SCN_URIDROPPED:
@ -1170,6 +1172,7 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_token = 0;
m_annotationLinesAdded = 0;
m_updated = 0;
m_listCompletionMethod = 0;
#if wxUSE_DRAG_AND_DROP
m_dragFlags = wxDrag_CopyOnly;
@ -1208,6 +1211,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_token = event.m_token;
m_annotationLinesAdded = event.m_annotationLinesAdded;
m_updated = event.m_updated;
m_listCompletionMethod = event.m_listCompletionMethod;
#if wxUSE_DRAG_AND_DROP
m_dragFlags = event.m_dragFlags;

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

@ -555,6 +555,7 @@ public:
void SetToken(int val) { m_token = val; }
void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; }
void SetUpdated(int val) { m_updated = val; }
void SetListCompletionMethod(int val) { m_listCompletionMethod = val; }
#ifdef STC_USE_DND
// Kept for backwards compatibility, use SetString().
void SetDragText(const wxString& val) { SetString(val); }
@ -593,6 +594,7 @@ public:
int GetToken() const { return m_token; }
int GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
int GetUpdated() const { return m_updated; }
int GetListCompletionMethod() const { return m_listCompletionMethod; }
#ifdef STC_USE_DND
// Kept for backwards compatibility, use GetString().
@ -637,6 +639,7 @@ private:
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_listCompletionMethod;
#if wxUSE_DRAG_AND_DROP
int m_dragFlags; // wxEVT_STC_START_DRAG

2
src/stc/stc.interface.h.in
View File

@ -455,6 +455,7 @@ public:
void SetToken(int val);
void SetAnnotationLinesAdded(int val);
void SetUpdated(int val);
void SetListCompletionMethod(int val);
void SetDragText(const wxString& val);
void SetDragFlags(int flags);
void SetDragResult(wxDragResult val);
@ -482,6 +483,7 @@ public:
int GetToken() const;
int GetAnnotationsLinesAdded() const;
int GetUpdated() const;
int GetListCompletionMethod() const;
/**
@deprecated Use GetString() instead.