diff --git a/docs/changes.txt b/docs/changes.txt
index eb3a83dd5d..05a63e70a6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -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:
 
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index fb9041b942..c272ea4c64 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -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
diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index 3db14daaa7..97f92bea40 100644
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -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.
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 6e91dc10e9..588bbabbb5 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -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;
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 995480ca75..8e766d279e 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -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;
diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 402a8b3298..0c27c85989 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -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
diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in
index f786c5dad0..21ca6e6b06 100644
--- a/src/stc/stc.interface.h.in
+++ b/src/stc/stc.interface.h.in
@@ -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.