# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# 
# T2 SDE: package/.../wxwidgets24/freetype.patch
# Copyright (C) 2007 The T2 SDE Project
# 
# More information can be found in the files COPYING and README.
# 
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---

--- wxPythonSrc-2.4.2.4/src/generic/dcpsg.cpp_orig	2007-03-16 11:14:45.000000000 +0100
+++ wxPythonSrc-2.4.2.4/src/generic/dcpsg.cpp	2007-03-16 11:14:55.000000000 +0100
@@ -1146,8 +1146,13 @@
   FILE *file;
 };
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_move_to( const FT_Vector* to,
+			 void *user_data)
+#else
 static int paps_move_to( FT_Vector* to,
 			 void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file, "%d %d moveto\n",
@@ -1156,8 +1161,13 @@
   return 0;
 }
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_line_to( const FT_Vector*  to,
+			 void *user_data)
+#else
 static int paps_line_to( FT_Vector*  to,
 			 void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file, "%d %d lineto\n",
@@ -1166,9 +1176,15 @@
   return 0;
 }
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_conic_to( const FT_Vector*  control,
+			  const FT_Vector*  to,
+			  void *user_data)
+#else
 static int paps_conic_to( FT_Vector*  control,
 			  FT_Vector*  to,
 			  void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file, "%d %d %d %d conicto\n",
@@ -1179,10 +1195,17 @@
   return 0;
 }
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_cubic_to( const FT_Vector*  control1,
+			  const FT_Vector*  control2,
+			  const FT_Vector*  to,
+			  void *user_data)
+#else
 static int paps_cubic_to( FT_Vector*  control1,
 			  FT_Vector*  control2,
 			  FT_Vector*  to,
 			  void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file,