Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile errors when using gtk 1.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-06-02 22:38:13 +00:00
parent f325fa52de
commit 6376cdc3a5
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/eggtrayicon.c
View File

@@ -107,9 +107,10 @@ Anders
#include "wx/platform.h" #include "wx/platform.h"
#include <gdk/gdkx.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 <string.h>
#include "eggtrayicon.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)

6
src/gtk/taskbar.cpp
View File

@@ -20,9 +20,10 @@
#include "wx/frame.h" #include "wx/frame.h"
#include <gdk/gdkx.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 "wx/gtk/taskbarpriv.h"
#include "eggtrayicon.h" #include "eggtrayicon.h"
@@ -66,3 +67,4 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
} }
#endif // __WXGTK20__ #endif // __WXGTK20__
#endif // GTK_CHECK_VERSION(2, 1, 0)

8
src/gtk1/eggtrayicon.c
View File

@@ -107,9 +107,10 @@ Anders
#include "wx/platform.h" #include "wx/platform.h"
#include <gdk/gdkx.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 <string.h>
#include "eggtrayicon.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)

6
src/gtk1/taskbar.cpp
View File

@@ -20,9 +20,10 @@
#include "wx/frame.h" #include "wx/frame.h"
#include <gdk/gdkx.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 "wx/gtk/taskbarpriv.h"
#include "eggtrayicon.h" #include "eggtrayicon.h"
@@ -66,3 +67,4 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
} }
#endif // __WXGTK20__ #endif // __WXGTK20__
#endif // GTK_CHECK_VERSION(2, 1, 0)