blob: 57072e5168f76b2c9803a8cd9d7f91f0c8d37b7c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
https://bugs.gentoo.org/307603
http://svn.berlios.de/wsvn/codeblocks/?op=comp&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5713&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5716
--- a/src/plugins/contrib/codesnippets/codesnippets.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
@@ -52,8 +52,12 @@
#include "memorymappedfile.h"
#if defined(__WXGTK__)
+ // hack to avoid name-conflict between wxWidgets GSocket and the one defined
+ // in newer glib-headers
+ #define GSocket GLibSocket
+ #include <gdk/gdkx.h>
+ #undef GSocket
#include "wx/gtk/win_gtk.h"
- #include <gdk/gdkx.h>
#endif
// The plugin needs a flag ON to enable some code for the plugin
--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
@@ -49,8 +49,12 @@
#include "menuidentifiers.h"
#include "editsnippetframe.h"
#if defined(__WXGTK__)
+ // hack to avoid name-conflict between wxWidgets GSocket and the one defined
+ // in newer glib-headers
+ #define GSocket GLibSocket
+ #include <gdk/gdkx.h>
+ #undef GSocket
#include "wx/gtk/win_gtk.h"
- #include <gdk/gdkx.h>
#endif
IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)
|
GitWeb
