From 7b37ceb5f14dbc8bf17c03c7b6e202bf023cfac7 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Tue, 6 Sep 2011 15:49:25 +1000
Subject: Always use Cairo for drawing.

---
 gtk/PlatGTK.cxx      | 4 +---
 gtk/ScintillaGTK.cxx | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 39dba1d71..8fe55145a 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -43,9 +43,7 @@
 #define IS_WIDGET_FOCUSSED(w) (GTK_WIDGET_HAS_FOCUS(w))
 #endif
 
-#if GTK_CHECK_VERSION(2,22,0)
 #define USE_CAIRO 1
-#endif
 
 #ifdef USE_CAIRO
 
@@ -2961,7 +2959,7 @@ bool Platform::IsDBCSLeadByte(int codePage, char ch) {
 			// Shift_jis
 			return ((uch >= 0x81) && (uch <= 0x9F)) ||
 				((uch >= 0xE0) && (uch <= 0xFC));
-				// Lead bytes F0 to FC may be a Microsoft addition. 
+				// Lead bytes F0 to FC may be a Microsoft addition.
 		case 936:
 			// GBK
 			return (uch >= 0x81) && (uch <= 0xFE);
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index b7cea5ed3..0932c6e3b 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -74,9 +74,7 @@
 #define IS_WIDGET_VISIBLE(w) (GTK_WIDGET_VISIBLE(w))
 #endif
 
-#if GTK_CHECK_VERSION(2,22,0)
 #define USE_CAIRO 1
-#endif
 
 static GdkWindow *WindowFromWidget(GtkWidget *w) {
 #if GTK_CHECK_VERSION(3,0,0)
-- 
cgit v1.2.3