Replace multiple mode setting calls on Surface with SetMode as this is

extensible.
For CallTip, GTK and Qt hardcode BidiR2L to false as they don't support
bidirectional, its the same as current, and the BidiR2L state on EditModel isn't
easily accessible.

1 files changed, 2 insertions, 4 deletions

diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 50e46ecc8..312ad1f94 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -2980,8 +2980,7 @@ gboolean ScintillaGTK::DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip) {
 	try {
 		std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(SC_TECHNOLOGY_DEFAULT));
 		surfaceWindow->Init(cr, widget);
-		surfaceWindow->SetUnicodeMode(SC_CP_UTF8 == ctip->codePage);
-		surfaceWindow->SetDBCSMode(ctip->codePage);
+		surfaceWindow->SetMode(SurfaceMode(ctip->codePage, false));
 		ctip->PaintCT(surfaceWindow.get());
 		surfaceWindow->Release();
 	} catch (...) {
@@ -2997,8 +2996,7 @@ gboolean ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, Cal
 		std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(SC_TECHNOLOGY_DEFAULT));
 		cairo_t *cr = gdk_cairo_create(WindowFromWidget(widget));
 		surfaceWindow->Init(cr, widget);
-		surfaceWindow->SetUnicodeMode(SC_CP_UTF8 == ctip->codePage);
-		surfaceWindow->SetDBCSMode(ctip->codePage);
+		surfaceWindow->SetMode(SurfaceMode(ctip->codePage, false));
 		ctip->PaintCT(surfaceWindow.get());
 		surfaceWindow->Release();
 		cairo_destroy(cr);