projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use built-in support for menu bitmaps if they are too big, they don't come...
[wxWidgets.git]
/
src
/
gtk1
/
eggtrayicon.c
diff --git
a/src/gtk1/eggtrayicon.c
b/src/gtk1/eggtrayicon.c
index 6c4c3b1cf3c677c2b7c5d9a60d3293e83ab43664..cd36bde116886606462a849448eef3966f5186bc 100644
(file)
--- a/
src/gtk1/eggtrayicon.c
+++ b/
src/gtk1/eggtrayicon.c
@@
-106,10
+106,13
@@
Anders
#include "wx/platform.h"
#include "wx/platform.h"
+#include <gdk/gdkx.h>
+
#ifdef __WXGTK20__
#ifdef __WXGTK20__
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)
#include <string.h>
#include <string.h>
-#include <gdk/gdkx.h>
#include "eggtrayicon.h"
#define SYSTEM_TRAY_REQUEST_DOCK 0
#include "eggtrayicon.h"
#define SYSTEM_TRAY_REQUEST_DOCK 0
@@
-132,7
+135,7
@@
egg_tray_icon_get_type (void)
if (our_type == 0)
{
if (our_type == 0)
{
-
static
const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (EggTrayIconClass),
(GBaseInitFunc) NULL,
{
sizeof (EggTrayIconClass),
(GBaseInitFunc) NULL,
@@
-145,7
+148,8
@@
egg_tray_icon_get_type (void)
(GInstanceInitFunc) egg_tray_icon_init
};
(GInstanceInitFunc) egg_tray_icon_init
};
- our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
+ our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon",
+ &our_info, (GTypeFlags)0);
}
return our_type;
}
return our_type;
@@
-435,3
+439,4
@@
egg_tray_icon_cancel_message (EggTrayIcon *icon,
}
#endif /* __WXGTK20__ */
}
#endif /* __WXGTK20__ */
+#endif /* GTK_CHECK_VERSION(2, 1, 0) */