aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2013-12-19 09:40:03 +1100
committerNeil Hodgson <nyamatongwe@gmail.com>2013-12-19 09:40:03 +1100
commit7aecd8b2ced5a46a7b91c975b659fea3c5ffc9f5 (patch)
tree9531cd7de16e8cea7510e7c445864cd2f8904940
parent07510a6ffd4f5b286c0d39711ddd9a651c4a84e2 (diff)
downloadscintilla-mirror-7aecd8b2ced5a46a7b91c975b659fea3c5ffc9f5.tar.gz
Expose the EOLMode on the document object.
From John Ehresman.
-rw-r--r--doc/ScintillaHistory.html3
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.cpp8
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.h2
3 files changed, 13 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 9418f6605..6ab0be8c7 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -466,6 +466,9 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1564/">Bug #1564</a>.
</li>
<li>
+ On Qt expose the EOLMode on the document object.
+ </li>
+ <li>
Fix hotspot clicking where area was off by half a character width.
<a href="http://sourceforge.net/p/scintilla/bugs/1562/">Bug #1562</a>.
</li>
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index 6240a7699..b529abd30 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -253,6 +253,14 @@ void ScintillaDocument::set_code_page(int code_page) {
((Document *)pdoc)->dbcsCodePage = code_page;
}
+int ScintillaDocument::get_eol_mode() {
+ return ((Document *)pdoc)->eolMode;
+}
+
+void ScintillaDocument::set_eol_mode(int eol_mode) {
+ ((Document *)pdoc)->eolMode = eol_mode;
+}
+
int ScintillaDocument::move_position_outside_char(int pos, int move_dir, bool check_line_end) {
return ((Document *)pdoc)->MovePositionOutsideChar(pos, move_dir, check_line_end);
}
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h
index 3cf16e334..fb9f76310 100644
--- a/qt/ScintillaEdit/ScintillaDocument.h
+++ b/qt/ScintillaEdit/ScintillaDocument.h
@@ -70,6 +70,8 @@ public:
int decorations_end(int indic, int position);
int get_code_page();
void set_code_page(int code_page);
+ int get_eol_mode();
+ void set_eol_mode(int eol_mode);
int move_position_outside_char(int pos, int move_dir, bool check_line_end);
private: