diff -u XaraLX-0.7r1785.orig/wxOil/ftfonts.cpp XaraLX-0.7r1785/wxOil/ftfonts.cpp
--- XaraLX-0.7r1785.orig/wxOil/ftfonts.cpp	2007-11-07 02:48:24.000000000 +0200
+++ XaraLX-0.7r1785/wxOil/ftfonts.cpp	2010-05-22 20:22:08.000000000 +0300
@@ -122,7 +122,9 @@
 #include FT_TYPE1_TABLES_H
 
 #ifdef __WXGTK20__
+#define GSocket GlibSocket
 #include <gtk/gtk.h>
+#undef GSocket
 extern GtkWidget *wxGetRootWindow();
 #endif
 
--- XaraLX-0.7r1785/wxOil/bitmapgriddropdown.cpp	2007-11-07 02:48:25.000000000 +0200
+++ XaraLX-0.7r1785/wxOil/bitmapgriddropdown.cpp	2010-05-22 20:28:37.000000000 +0300
@@ -122,7 +122,7 @@
 #include "grnddib.h"
 #include "ppbrush.h"
 #include "qualattr.h"
-
+#include <algorithm>