diff --git a/src/plugins/contrib/codesnippets/codesnippets.cpp b/src/plugins/contrib/codesnippets/codesnippets.cpp index 499c815..fd2ab13 100644 --- a/src/plugins/contrib/codesnippets/codesnippets.cpp +++ b/src/plugins/contrib/codesnippets/codesnippets.cpp @@ -52,8 +52,13 @@ #include "memorymappedfile.h" #if defined(__WXGTK__) + // newer versions of glib define its own GSocket but we unfortunately use this + // name in our own (semi-)public header and so can't change it -- rename glib + // one instead + #define GSocket GlibSocket #include "wx/gtk/win_gtk.h" #include <gdk/gdkx.h> + #undef GlibSocket #endif // The plugin needs a flag ON to enable some code for the plugin diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp index d33b08d..6a1905d 100644 --- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp +++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp @@ -49,8 +49,13 @@ #include "menuidentifiers.h" #include "editsnippetframe.h" #if defined(__WXGTK__) + // newer versions of glib define its own GSocket but we unfortunately use this + // name in our own (semi-)public header and so can't change it -- rename glib + // one instead + #define GSocket GlibSocket #include "wx/gtk/win_gtk.h" #include <gdk/gdkx.h> + #undef GlibSocket #endif IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)