wok-6.x view codeblocks/stuff/glib.u @ rev 11583

elfutils: remove dep loop
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jan 06 19:01:19 2012 +0100 (2012-01-06)
parents
children
line source
1 Both glib and wx define GSocket, see http://trac.wxwidgets.org/ticket/10883
2
3 --- codeblocks-8.02/src/src/prefix.cpp
4 +++ codeblocks-8.02/src/src/prefix.cpp
5 @@ -393,7 +393,7 @@
6
7 br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
8
9 - end = strrchr (path, '/');
10 + end = strrchr ((char *) path, '/');
11 if (!end) return strdup (".");
12
13 while (end > path && *end == '/')
14 @@ -429,7 +429,7 @@
15 br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
16
17 if (!*path) return strdup ("/");
18 - end = strrchr (path, '/');
19 + end = strrchr ((char *) path, '/');
20 if (!end) return strdup (path);
21
22 tmp = br_strndup ((char *) path, end - path);
23
24 --- codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippets.cpp
25 +++ codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippets.cpp
26 @@ -21,6 +21,13 @@
27
28 #include <cstring>
29 #include "sdk.h"
30 +#if defined(__WXGTK__)
31 +#define GSocket GlibGSocket
32 + #include "wx/gtk/win_gtk.h"
33 +#undef GSocket
34 + #include <gdk/gdkx.h>
35 +#endif
36 +
37 #ifndef CB_PRECOMP
38 #include <wx/event.h>
39 #include <wx/frame.h> // Manager::Get()->GetAppWindow()
40 @@ -51,11 +58,6 @@
41 #include <wx/wxFlatNotebook/wxFlatNotebook.h>
42 #include "memorymappedfile.h"
43
44 -#if defined(__WXGTK__)
45 - #include "wx/gtk/win_gtk.h"
46 - #include <gdk/gdkx.h>
47 -#endif
48 -
49 // The plugin needs a flag ON to enable some code for the plugin
50 #if !defined(BUILDING_PLUGIN)
51 #error preprocessor BUILDING_PLUGIN flag required for this target
52
53 --- codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
54 +++ codeblocks-8.02/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
55 @@ -19,6 +19,12 @@
56 */
57 // RCS-ID: $Id: codesnippetstreectrl.cpp 112 2008-01-07 17:03:31Z Pecan $
58
59 +#if defined(__WXGTK__)
60 +#define GSocket GlibGSocket
61 + #include "wx/gtk/win_gtk.h"
62 +#undef GSocket
63 + #include <gdk/gdkx.h>
64 +#endif
65 #ifdef WX_PRECOMP
66 #include "wx_pch.h"
67 #else
68 @@ -48,10 +54,6 @@
69 #include "messagebox.h"
70 #include "menuidentifiers.h"
71 #include "editsnippetframe.h"
72 -#if defined(__WXGTK__)
73 - #include "wx/gtk/win_gtk.h"
74 - #include <gdk/gdkx.h>
75 -#endif
76
77 IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)
78