2 files changed, 8 insertions, 7 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index d3e5f3090..686012f32 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -355,7 +355,7 @@ void Editor::RefreshStyleData() {
 	}
 }
 
-Point Editor::GetVisibleOriginInMain() {
+Point Editor::GetVisibleOriginInMain() const {
 	return Point(0,0);
 }
 
@@ -379,8 +379,9 @@ int Editor::TopLineOfMain() const {
 		return topLine;
 }
 
-PRectangle Editor::GetClientRectangle() {
-	return wMain.GetClientPosition();
+PRectangle Editor::GetClientRectangle() const {
+	Window &win = const_cast<Window &>(wMain);
+	return win.GetClientPosition();
 }
 
 PRectangle Editor::GetClientDrawingRectangle() {
@@ -394,7 +395,7 @@ PRectangle Editor::GetTextRectangle() {
 	return rc;
 }
 
-int Editor::LinesOnScreen() {
+int Editor::LinesOnScreen() const {
 	PRectangle rcClient = GetClientRectangle();
 	int htClient = static_cast<int>(rcClient.bottom - rcClient.top);
 	//Platform::DebugPrintf("lines on screen = %d\n", htClient / lineHeight + 1);
diff --git a/src/Editor.h b/src/Editor.h
index c7d44c16d..103891e71 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -333,14 +333,14 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 
 	// The top left visible point in main window coordinates. Will be 0,0 except for
 	// scroll views where it will be equivalent to the current scroll position.
-	virtual Point GetVisibleOriginInMain();
+	virtual Point GetVisibleOriginInMain() const;
 	Point DocumentPointFromView(Point ptView);  // Convert a point from view space to document
 	int TopLineOfMain() const;   // Return the line at Main's y coordinate 0
-	virtual PRectangle GetClientRectangle();
+	virtual PRectangle GetClientRectangle() const;
 	virtual PRectangle GetClientDrawingRectangle();
 	PRectangle GetTextRectangle();
 
-	int LinesOnScreen();
+	int LinesOnScreen() const;
 	int LinesToScroll();
 	int MaxScrollPos();
 	SelectionPosition ClampPositionIntoDocument(SelectionPosition sp) const;