Add virtual ~wxAnyScrollHelperBase() to fix compiler warning.

[wxWidgets.git] / src / gtk / eggtrayicon.h

diff --git a/src/gtk/eggtrayicon.h b/src/gtk/eggtrayicon.h
index ad8c9e809d87f2dd81aa62d0b995734d8bb6f78c..aee0346af42a4685665ed485a0b45d6572f64c66 100644 (file)
--- a/src/gtk/eggtrayicon.h
+++ b/src/gtk/eggtrayicon.h
@@ -1,5 +1,5 @@
 /*
-    Permission to use this file under wxWindows license granted by
+    Permission to use this file under wxWindows licence granted by
     the copyright holder, see eggtrayicon.c for details.
  */
 
@@ -26,19 +26,21 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-#include <gtk/gtkplug.h>
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 
 G_BEGIN_DECLS
 
-#define EGG_TYPE_TRAY_ICON             (egg_tray_icon_get_type ())
-#define EGG_TRAY_ICON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-#define EGG_TRAY_ICON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-#define EGG_IS_TRAY_ICON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-#define EGG_IS_TRAY_ICON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-#define EGG_TRAY_ICON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-       
-typedef struct _EggTrayIcon      EggTrayIcon;
+#define EGG_TYPE_TRAY_ICON                (egg_tray_icon_get_type ())
+#define EGG_TRAY_ICON(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
+#define EGG_TRAY_ICON_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
+#define EGG_IS_TRAY_ICON(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
+#define EGG_IS_TRAY_ICON_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
+#define EGG_TRAY_ICON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
+
+typedef struct _EggTrayIcon          EggTrayIcon;
 typedef struct _EggTrayIconClass  EggTrayIconClass;
 
 struct _EggTrayIcon
@@ -46,11 +48,15 @@ struct _EggTrayIcon
   GtkPlug parent_instance;
 
   guint stamp;
-  
+
+#ifdef GDK_WINDOWING_X11
   Atom selection_atom;
   Atom manager_atom;
   Atom system_tray_opcode_atom;
+  Atom orientation_atom;
   Window manager_window;
+#endif
+  GtkOrientation orientation;
 };
 
 struct _EggTrayIconClass
@@ -61,19 +67,19 @@ struct _EggTrayIconClass
 GType        egg_tray_icon_get_type       (void);
 
 EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-                                          const gchar *name);
+                                           const gchar *name);
 
 EggTrayIcon *egg_tray_icon_new            (const gchar *name);
 
 guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-                                          gint         timeout,
-                                          const char  *message,
-                                          gint         len);
+                                           gint         timeout,
+                                           const char  *message,
+                                           gint         len);
 void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-                                          guint        id);
+                                           guint        id);
 
+GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
 
-                                           
 G_END_DECLS
 
 #endif /* __EGG_TRAY_ICON_H__ */