diff options
Diffstat (limited to 'scintilla/src')
| -rw-r--r-- | scintilla/src/Document.cxx | 2 | ||||
| -rw-r--r-- | scintilla/src/EditModel.h | 2 | ||||
| -rw-r--r-- | scintilla/src/Editor.h | 2 | ||||
| -rw-r--r-- | scintilla/src/ScintillaBase.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx index 47c2302..fbb305b 100644 --- a/scintilla/src/Document.cxx +++ b/scintilla/src/Document.cxx @@ -216,6 +216,8 @@ void Document::SetSavePoint() { }
void Document::TentativeUndo() {
+ if (!TentativeActive())
+ return;
CheckReadOnly();
if (enteredModification == 0) {
enteredModification++;
diff --git a/scintilla/src/EditModel.h b/scintilla/src/EditModel.h index fce26bd..33c1ac0 100644 --- a/scintilla/src/EditModel.h +++ b/scintilla/src/EditModel.h @@ -25,7 +25,7 @@ public: class EditModel { // Private so EditModel objects can not be copied - EditModel(const EditModel &); + explicit EditModel(const EditModel &); EditModel &operator=(const EditModel &); public: diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h index 82640fb..15adde8 100644 --- a/scintilla/src/Editor.h +++ b/scintilla/src/Editor.h @@ -153,7 +153,7 @@ struct WrapPending { */
class Editor : public EditModel, public DocWatcher {
// Private so Editor objects can not be copied
- Editor(const Editor &);
+ explicit Editor(const Editor &);
Editor &operator=(const Editor &);
protected: // ScintillaBase subclass needs access to much of Editor
diff --git a/scintilla/src/ScintillaBase.h b/scintilla/src/ScintillaBase.h index 28155ff..9cffce5 100644 --- a/scintilla/src/ScintillaBase.h +++ b/scintilla/src/ScintillaBase.h @@ -20,7 +20,7 @@ class LexState; */
class ScintillaBase : public Editor {
// Private so ScintillaBase objects can not be copied
- ScintillaBase(const ScintillaBase &);
+ explicit ScintillaBase(const ScintillaBase &);
ScintillaBase &operator=(const ScintillaBase &);
protected:
|