From 7bb6007a6775a53651e3c29c8b3237ea1a8c2245 Mon Sep 17 00:00:00 2001
From: raburton <Unknown>
Date: Mon, 14 Apr 2008 18:42:33 +0000
Subject: [PATCH] =?UTF-8?q?Restore=20xw2.6=20compatibility,=20thanks=20to?=
 =?UTF-8?q?=20Ra=C3=BAl=20S=C3=A1nchez=20Siles=20for=20patch.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/colors.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/colors.h b/include/colors.h
index 686c989166..3b9816d729 100644
--- a/include/colors.h
+++ b/include/colors.h
@@ -129,17 +129,19 @@ StructColors ColorRefs[NBCOLOR] =
  */
 static inline wxColour MakeColour( int aColor )
 {
+#if wxCHECK_VERSION(2,8,5)
     int alpha = GetAlpha( aColor );
-
     alpha = alpha ? alpha : wxALPHA_OPAQUE;
-
+#endif
     int ndx = aColor & MASKCOLOR;
 
     return wxColour(
                 ColorRefs[ndx].m_Red,
                 ColorRefs[ndx].m_Green,
-                ColorRefs[ndx].m_Blue,
-                (unsigned char) alpha
+                ColorRefs[ndx].m_Blue
+#if wxCHECK_VERSION(2,8,5)
+                ,(unsigned char) alpha
+#endif
                 );
 }