wok-next diff codeblocks/stuff/glib.u @ rev 17109
transmission: remove qt (gcc4.7 only)
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Mon Sep 01 18:53:10 2014 +0200 (2014-09-01) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/codeblocks/stuff/glib.u Mon Sep 01 18:53:10 2014 +0200 1.3 @@ -0,0 +1,78 @@ 1.4 +Both glib and wx define GSocket, see http://trac.wxwidgets.org/ticket/10883 1.5 + 1.6 +--- codeblocks-8.02/src/src/prefix.cpp 1.7 ++++ codeblocks-8.02/src/src/prefix.cpp 1.8 +@@ -393,7 +393,7 @@ 1.9 + 1.10 + br_return_val_if_fail (path != (char *) NULL, (char *) NULL); 1.11 + 1.12 +- end = strrchr (path, '/'); 1.13 ++ end = strrchr ((char *) path, '/'); 1.14 + if (!end) return strdup ("."); 1.15 + 1.16 + while (end > path && *end == '/') 1.17 +@@ -429,7 +429,7 @@ 1.18 + br_return_val_if_fail (path != (char *) NULL, (char *) NULL); 1.19 + 1.20 + if (!*path) return strdup ("/"); 1.21 +- end = strrchr (path, '/'); 1.22 ++ end = strrchr ((char *) path, '/'); 1.23 + if (!end) return strdup (path); 1.24 + 1.25 + tmp = br_strndup ((char *) path, end - path); 1.26 + 1.27 +--- codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippets.cpp 1.28 ++++ codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippets.cpp 1.29 +@@ -21,6 +21,13 @@ 1.30 + 1.31 + #include <cstring> 1.32 + #include "sdk.h" 1.33 ++#if defined(__WXGTK__) 1.34 ++#define GSocket GlibGSocket 1.35 ++ #include "wx/gtk/win_gtk.h" 1.36 ++#undef GSocket 1.37 ++ #include <gdk/gdkx.h> 1.38 ++#endif 1.39 ++ 1.40 + #ifndef CB_PRECOMP 1.41 + #include <wx/event.h> 1.42 + #include <wx/frame.h> // Manager::Get()->GetAppWindow() 1.43 +@@ -51,11 +58,6 @@ 1.44 + #include <wx/wxFlatNotebook/wxFlatNotebook.h> 1.45 + #include "memorymappedfile.h" 1.46 + 1.47 +-#if defined(__WXGTK__) 1.48 +- #include "wx/gtk/win_gtk.h" 1.49 +- #include <gdk/gdkx.h> 1.50 +-#endif 1.51 +- 1.52 + // The plugin needs a flag ON to enable some code for the plugin 1.53 + #if !defined(BUILDING_PLUGIN) 1.54 + #error preprocessor BUILDING_PLUGIN flag required for this target 1.55 + 1.56 +--- codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp 1.57 ++++ codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp 1.58 +@@ -19,6 +19,12 @@ 1.59 + */ 1.60 + // RCS-ID: $Id: codesnippetstreectrl.cpp 112 2008-01-07 17:03:31Z Pecan $ 1.61 + 1.62 ++#if defined(__WXGTK__) 1.63 ++#define GSocket GlibGSocket 1.64 ++ #include "wx/gtk/win_gtk.h" 1.65 ++#undef GSocket 1.66 ++ #include <gdk/gdkx.h> 1.67 ++#endif 1.68 + #ifdef WX_PRECOMP 1.69 + #include "wx_pch.h" 1.70 + #else 1.71 +@@ -48,10 +54,6 @@ 1.72 + #include "messagebox.h" 1.73 + #include "menuidentifiers.h" 1.74 + #include "editsnippetframe.h" 1.75 +-#if defined(__WXGTK__) 1.76 +- #include "wx/gtk/win_gtk.h" 1.77 +- #include <gdk/gdkx.h> 1.78 +-#endif 1.79 + 1.80 + IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl) 1.81 +