GTK+ 2.0 can't compile egg tray code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/eggtrayicon.c b/src/gtk/eggtrayicon.c
index 6c4c3b1cf3c677c2b7c5d9a60d3293e83ab43664..de2777a4fd95e71c89d3e30543f26326c41af2c7 100644 (file)
--- a/src/gtk/eggtrayicon.c
+++ b/src/gtk/eggtrayicon.c
@@ -106,10 +106,12 @@ Anders
 
 #include "wx/platform.h"
 
 
 #include "wx/platform.h"
 

-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && 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

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index fe4c00d4afb5edf284361a31aa97324c1d17bd75..859a89f7cda0a75153d55d8dc02948bf158ab7f7 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -19,7 +19,10 @@
 #include "wx/log.h"
 #include "wx/frame.h"
 
 #include "wx/log.h"
 #include "wx/frame.h"
 

-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)

 
 #include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"
 
 #include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"

diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c
index 6c4c3b1cf3c677c2b7c5d9a60d3293e83ab43664..de2777a4fd95e71c89d3e30543f26326c41af2c7 100644 (file)
--- a/src/gtk1/eggtrayicon.c
+++ b/src/gtk1/eggtrayicon.c
@@ -106,10 +106,12 @@ Anders
 
 #include "wx/platform.h"
 
 
 #include "wx/platform.h"
 

-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && 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

diff --git a/src/gtk1/taskbar.cpp b/src/gtk1/taskbar.cpp
index fe4c00d4afb5edf284361a31aa97324c1d17bd75..859a89f7cda0a75153d55d8dc02948bf158ab7f7 100644 (file)
--- a/src/gtk1/taskbar.cpp
+++ b/src/gtk1/taskbar.cpp
@@ -19,7 +19,10 @@
 #include "wx/log.h"
 #include "wx/frame.h"
 
 #include "wx/log.h"
 #include "wx/frame.h"
 

-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)

 
 #include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"
 
 #include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"