Attachment #234195 for bug #126867

Lines 122-128 Link Here

(-)XaraLX-0.7r1785.orig/wxOil/ftfonts.cpp (+2 lines)
122	#include FT_TYPE1_TABLES_H	122	#include FT_TYPE1_TABLES_H
123		123
124	#ifdef __WXGTK20__	124	#ifdef __WXGTK20__
		125	#define GSocket GlibSocket
125	#include <gtk/gtk.h>	126	#include <gtk/gtk.h>
		127	#undef GSocket
126	extern GtkWidget *wxGetRootWindow();	128	extern GtkWidget *wxGetRootWindow();
127	#endif	129	#endif
128		130

Lines 122-128 Link Here

(-)XaraLX-0.7r1785/wxOil/bitmapgriddropdown.cpp (-1 / +1 lines)
122	#include "grnddib.h"	122	#include "grnddib.h"
123	#include "ppbrush.h"	123	#include "ppbrush.h"
124	#include "qualattr.h"	124	#include "qualattr.h"
125		125	#include <algorithm>
126		126
127		127
128		128

Return to bug 126867