Some resize grip cleanups

[~andy/gtk] / gtk / gtkstatusicon.h

diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
old mode 100755 (executable)
new mode 100644 (file)
index 1df579a..6d93d2a
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -21,7 +21,7 @@
  *      Mark McLoughlin <mark@skynet.ie>
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -48,7 +48,7 @@ struct _GtkStatusIcon
 {
   GObject               parent_instance;
 
-  GtkStatusIconPrivate *GSEAL (priv);
+  GtkStatusIconPrivate *priv;
 };
 
 struct _GtkStatusIconClass
@@ -67,10 +67,14 @@ struct _GtkStatusIconClass
                                      GdkEventButton *event);
   gboolean (* scroll_event)         (GtkStatusIcon  *status_icon,
                                      GdkEventScroll *event);
+  gboolean (* query_tooltip)        (GtkStatusIcon  *status_icon,
+                                     gint            x,
+                                     gint            y,
+                                     gboolean        keyboard_mode,
+                                     GtkTooltip     *tooltip);
 
   void (*__gtk_reserved1);
   void (*__gtk_reserved2);
-  void (*__gtk_reserved3);
 };
 
 GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
@@ -106,16 +110,21 @@ void                  gtk_status_icon_set_screen         (GtkStatusIcon      *st
                                                           GdkScreen          *screen);
 GdkScreen            *gtk_status_icon_get_screen         (GtkStatusIcon      *status_icon);
 
-void                  gtk_status_icon_set_tooltip        (GtkStatusIcon      *status_icon,
-                                                          const gchar        *tooltip_text);
+void                  gtk_status_icon_set_has_tooltip    (GtkStatusIcon      *status_icon,
+                                                          gboolean            has_tooltip);
+void                  gtk_status_icon_set_tooltip_text   (GtkStatusIcon      *status_icon,
+                                                          const gchar        *text);
+void                  gtk_status_icon_set_tooltip_markup (GtkStatusIcon      *status_icon,
+                                                          const gchar        *markup);
+void                  gtk_status_icon_set_title          (GtkStatusIcon      *status_icon,
+                                                          const gchar        *title);
+G_CONST_RETURN gchar *gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
+void                  gtk_status_icon_set_name           (GtkStatusIcon      *status_icon,
+                                                          const gchar        *name);
 void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
                                                          gboolean            visible);
 gboolean              gtk_status_icon_get_visible        (GtkStatusIcon      *status_icon);
 
-void                  gtk_status_icon_set_blinking       (GtkStatusIcon      *status_icon,
-                                                         gboolean            blinking);
-gboolean              gtk_status_icon_get_blinking       (GtkStatusIcon      *status_icon);
-
 gboolean              gtk_status_icon_is_embedded        (GtkStatusIcon      *status_icon);
 
 void                  gtk_status_icon_position_menu      (GtkMenu            *menu,