Attachment #228101 for bug #307603

View | Details | Raw Unified | Return to bug 307603
Collapse All | Expand All

Lines 52-59 Link Here

(-)a/src/plugins/contrib/codesnippets/codesnippets.cpp (-1 / +5 lines)
52	#include "memorymappedfile.h"	52	#include "memorymappedfile.h"
53		53
54	#if defined(__WXGTK__)	54	#if defined(__WXGTK__)
		55	// hack to avoid name-conflict between wxWidgets GSocket and the one defined
		56	// in newer glib-headers
		57	#define GSocket GLibSocket
		58	#include <gdk/gdkx.h>
		59	#undef GSocket
55	#include "wx/gtk/win_gtk.h"	60	#include "wx/gtk/win_gtk.h"
56	#include <gdk/gdkx.h>
57	#endif	61	#endif
58		62
59	// The plugin needs a flag ON to enable some code for the plugin	63	// The plugin needs a flag ON to enable some code for the plugin

Lines 49-56 Link Here

(-)a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp (-1 / +5 lines)
49	#include "menuidentifiers.h"	49	#include "menuidentifiers.h"
50	#include "editsnippetframe.h"	50	#include "editsnippetframe.h"
51	#if defined(__WXGTK__)	51	#if defined(__WXGTK__)
		52	// hack to avoid name-conflict between wxWidgets GSocket and the one defined
		53	// in newer glib-headers
		54	#define GSocket GLibSocket
		55	#include <gdk/gdkx.h>
		56	#undef GSocket
52	#include "wx/gtk/win_gtk.h"	57	#include "wx/gtk/win_gtk.h"
53	#include <gdk/gdkx.h>
54	#endif	58	#endif
55		59
56	IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)	60	IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)

Return to bug 307603