wok-6.x annotate codeblocks/stuff/glib.u @ rev 13813

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