From b57c5c13df4434754f3bf3d39c20e1926578a6da Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 13 May 2015 13:35:38 +1000
Subject: Bug [#1703]. Fix bug when drawing text margins in buffered mode which
 would use default encoding instead of chosen encoding.

---
 qt/ScintillaEditBase/PlatQt.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'qt/ScintillaEditBase/PlatQt.cpp')

diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 71bdae792..35e4aee78 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -182,7 +182,7 @@ void SurfaceImpl::Init(SurfaceID sid, WindowID /*wid*/)
 
 void SurfaceImpl::InitPixMap(int width,
         int height,
-        Surface * /*surface*/,
+        Surface *surface,
         WindowID /*wid*/)
 {
 	Release();
@@ -190,6 +190,9 @@ void SurfaceImpl::InitPixMap(int width,
 	if (height < 1) height = 1;
 	deviceOwned = true;
 	device = new QPixmap(width, height);
+	SurfaceImpl *psurfOther = static_cast<SurfaceImpl *>(surface);
+	SetUnicodeMode(psurfOther->unicodeMode);
+	SetDBCSMode(psurfOther->codePage);
 }
 
 void SurfaceImpl::Release()
-- 
cgit v1.2.3