Fix compile errors when using gtk 1.2

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

diff --git a/src/gtk/eggtrayicon.c b/src/gtk/eggtrayicon.c
index de2777a4fd95e71c89d3e30543f26326c41af2c7..4d244e04164439f7bd3c2ec3418d9cc8de1fb37d 100644 (file)
--- a/src/gtk/eggtrayicon.c
+++ b/src/gtk/eggtrayicon.c
@@ -107,9 +107,10 @@ Anders
 #include "wx/platform.h"
 
 #include <gdk/gdkx.h>
 #include "wx/platform.h"
 
 #include <gdk/gdkx.h>

-#include <gtk/gtkversion.h>

 
 

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

 
 #include <string.h>
 #include "eggtrayicon.h"
 
 #include <string.h>
 #include "eggtrayicon.h"


@@ -436,4 +437,5 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
                                      id, 0, 0);
 }
 
                                      id, 0, 0);
 }
 

-#endif /* __WXGTK20__ */
+#endif // __WXGTK20__
+#endif // GTK_CHECK_VERSION(2, 1, 0)

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 859a89f7cda0a75153d55d8dc02948bf158ab7f7..85dd72c3e2a4df24e1f11c2a5189ca3da762dd73 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -20,9 +20,10 @@
 #include "wx/frame.h"
 
 #include <gdk/gdkx.h>
 #include "wx/frame.h"
 
 #include <gdk/gdkx.h>

-#include <gtk/gtkversion.h>

 
 

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

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


@@ -66,3 +67,4 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
 }
 
 #endif // __WXGTK20__
 }
 
 #endif // __WXGTK20__

+#endif // GTK_CHECK_VERSION(2, 1, 0)

diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c
index de2777a4fd95e71c89d3e30543f26326c41af2c7..4d244e04164439f7bd3c2ec3418d9cc8de1fb37d 100644 (file)
--- a/src/gtk1/eggtrayicon.c
+++ b/src/gtk1/eggtrayicon.c
@@ -107,9 +107,10 @@ Anders
 #include "wx/platform.h"
 
 #include <gdk/gdkx.h>
 #include "wx/platform.h"
 
 #include <gdk/gdkx.h>

-#include <gtk/gtkversion.h>

 
 

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

 
 #include <string.h>
 #include "eggtrayicon.h"
 
 #include <string.h>
 #include "eggtrayicon.h"


@@ -436,4 +437,5 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
                                      id, 0, 0);
 }
 
                                      id, 0, 0);
 }
 

-#endif /* __WXGTK20__ */
+#endif // __WXGTK20__
+#endif // GTK_CHECK_VERSION(2, 1, 0)

diff --git a/src/gtk1/taskbar.cpp b/src/gtk1/taskbar.cpp
index 859a89f7cda0a75153d55d8dc02948bf158ab7f7..85dd72c3e2a4df24e1f11c2a5189ca3da762dd73 100644 (file)
--- a/src/gtk1/taskbar.cpp
+++ b/src/gtk1/taskbar.cpp
@@ -20,9 +20,10 @@
 #include "wx/frame.h"
 
 #include <gdk/gdkx.h>
 #include "wx/frame.h"
 
 #include <gdk/gdkx.h>

-#include <gtk/gtkversion.h>

 
 

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

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


@@ -66,3 +67,4 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
 }
 
 #endif // __WXGTK20__
 }
 
 #endif // __WXGTK20__

+#endif // GTK_CHECK_VERSION(2, 1, 0)