diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-02-01 13:05:20 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-02-01 13:05:20 +0000 |
| commit | 28e3c223e8e2463630d7fb298eb51b78c662d2d8 (patch) | |
| tree | 1de6e52c06204e1889c42e0aa3ee3aea4d787013 | |
| parent | f60a72dfd4f35d973c82d378cc436c4a5ef660a6 (diff) | |
| download | notepad2-mod-28e3c223e8e2463630d7fb298eb51b78c662d2d8.zip notepad2-mod-28e3c223e8e2463630d7fb298eb51b78c662d2d8.tar.gz notepad2-mod-28e3c223e8e2463630d7fb298eb51b78c662d2d8.tar.bz2 | |
using Sintilla 2.24
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@394 28bd50df-7adb-d945-0439-6e466c6a13cc
| -rw-r--r-- | Readme-mod.txt | 2 | ||||
| -rw-r--r-- | scintilla/lexlib/OptionSet.h | 2 | ||||
| -rw-r--r-- | scintilla/version.txt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Readme-mod.txt b/Readme-mod.txt index bb6c6b5..5218460 100644 --- a/Readme-mod.txt +++ b/Readme-mod.txt @@ -18,6 +18,6 @@ More information: * Kai Liu's website: http://code.kliu.org/misc/notepad2/
* Bookmark Edition website: http://www.rlvision.com/notepad2/about.asp
-Notepad2-mod 4.1.24 has been created with Scintilla 2.23. The unused lexers
+Notepad2-mod 4.1.24 has been created with Scintilla 2.24. The unused lexers
are commented out in "scintilla/src/Catalogue.cxx". You can use WDK 7.1, or MSVC 2010,
or ICL 12 to build Notepad2-mod.
diff --git a/scintilla/lexlib/OptionSet.h b/scintilla/lexlib/OptionSet.h index 1969173..ee3092c 100644 --- a/scintilla/lexlib/OptionSet.h +++ b/scintilla/lexlib/OptionSet.h @@ -80,6 +80,8 @@ class OptionSet { names += name;
}
public:
+ virtual ~OptionSet() {
+ }
void DefineProperty(const char *name, plcob pb, std::string description="") {
nameToDef[name] = Option(pb, description);
AppendName(name);
diff --git a/scintilla/version.txt b/scintilla/version.txt index 13875b9..a270d47 100644 --- a/scintilla/version.txt +++ b/scintilla/version.txt @@ -1 +1 @@ -223
+224
|