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

fixed bug for garbage text in NotifyParent

Browse Source 
Added method to set modification event mask


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-07-03 21:59:29 +00:00
parent 068407ed84
commit a8f9e1f310
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,6 +487,10 @@ public:
void SetKeywords(int keywordSet, const wxString& keywordList); void SetKeywords(int keywordSet, const wxString& keywordList);
// Event mask for Modified Event
void SetModEventMask(int mask);
//int GetModEventMask();
#ifndef SWIG #ifndef SWIG
private: private:
// Event handlers // Event handlers

15
contrib/src/stc/stc.cpp
View File

@@ -1397,6 +1397,18 @@ void wxStyledTextCtrl::SetKeywords(int keywordSet, const wxString& keywordLi
//----------------------------------------------------------------------
// Event mask for Modified Event
void wxStyledTextCtrl::SetModEventMask(int mask) {
SendMsg(SCI_SETMODEVENTMASK, mask);
}
//int wxStyledTextCtrl::GetModEventMask() {
// return SendMsg(SCI_GETMODEVENTMASK);
//}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Event handlers // Event handlers
@@ -1549,7 +1561,8 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
evt.SetModifiers(scn.modifiers); evt.SetModifiers(scn.modifiers);
if (eventType == wxEVT_STC_MODIFIED) { if (eventType == wxEVT_STC_MODIFIED) {
evt.SetModificationType(scn.modificationType); evt.SetModificationType(scn.modificationType);
evt.SetText(scn.text); if (scn.text)
evt.SetText(wxString(scn.text, scn.length));
evt.SetLength(scn.length); evt.SetLength(scn.length);
evt.SetLinesAdded(scn.linesAdded); evt.SetLinesAdded(scn.linesAdded);
evt.SetLine(scn.line); evt.SetLine(scn.line);

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

@@ -487,6 +487,10 @@ public:
void SetKeywords(int keywordSet, const wxString& keywordList); void SetKeywords(int keywordSet, const wxString& keywordList);
// Event mask for Modified Event
void SetModEventMask(int mask);
//int GetModEventMask();
#ifndef SWIG #ifndef SWIG
private: private:
// Event handlers // Event handlers

15
src/stc/stc.cpp
View File

@@ -1397,6 +1397,18 @@ void wxStyledTextCtrl::SetKeywords(int keywordSet, const wxString& keywordLi
//----------------------------------------------------------------------
// Event mask for Modified Event
void wxStyledTextCtrl::SetModEventMask(int mask) {
SendMsg(SCI_SETMODEVENTMASK, mask);
}
//int wxStyledTextCtrl::GetModEventMask() {
// return SendMsg(SCI_GETMODEVENTMASK);
//}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Event handlers // Event handlers
@@ -1549,7 +1561,8 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
evt.SetModifiers(scn.modifiers); evt.SetModifiers(scn.modifiers);
if (eventType == wxEVT_STC_MODIFIED) { if (eventType == wxEVT_STC_MODIFIED) {
evt.SetModificationType(scn.modificationType); evt.SetModificationType(scn.modificationType);
evt.SetText(scn.text); if (scn.text)
evt.SetText(wxString(scn.text, scn.length));
evt.SetLength(scn.length); evt.SetLength(scn.length);
evt.SetLinesAdded(scn.linesAdded); evt.SetLinesAdded(scn.linesAdded);
evt.SetLine(scn.line); evt.SetLine(scn.line);