summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/reference/gtk/tmpl/gtktooltips.sgml9
-rw-r--r--gtk/gtk.symbols4
-rw-r--r--gtk/gtktooltips.c2
-rw-r--r--gtk/gtktooltips.h4
4 files changed, 17 insertions, 2 deletions
diff --git a/docs/reference/gtk/tmpl/gtktooltips.sgml b/docs/reference/gtk/tmpl/gtktooltips.sgml
index d8c75e0947..1cf7ab54c3 100644
--- a/docs/reference/gtk/tmpl/gtktooltips.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltips.sgml
@@ -102,6 +102,7 @@ Information about the tooltip (if any) associated with an arbitrary widget can b
@widget:
@tip_text:
@tip_private:
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_new ##### -->
<para>
@@ -109,6 +110,7 @@ Creates an empty group of tooltips. This function initialises a #GtkTooltips str
</para>
@Returns: a new #GtkTooltips group for you to use.
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_enable ##### -->
@@ -117,6 +119,7 @@ Allows the user to see your tooltips as they navigate your application.
</para>
@tooltips: a #GtkTooltips.
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_disable ##### -->
@@ -125,6 +128,7 @@ Causes all tooltips in @tooltips to become inactive. Any widgets that have tips
</para>
@tooltips: a #GtkTooltips.
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_set_delay ##### -->
@@ -134,6 +138,7 @@ Sets the time between the user moving the mouse over a widget and the widget's t
@tooltips: a #GtkTooltips.
@delay: an integer value representing milliseconds.
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_set_tip ##### -->
@@ -145,6 +150,7 @@ Adds a tooltip containing the message @tip_text to the specified #GtkWidget.
@widget: the #GtkWidget you wish to associate the tip with.
@tip_text: a string containing the tip itself.
@tip_private: a string of any further information that may be useful if the user gets stuck.
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_data_get ##### -->
@@ -154,6 +160,7 @@ Retrieves any #GtkTooltipsData previously associated with the given widget.
@widget: a #GtkWidget.
@Returns: a #GtkTooltipsData struct, or %NULL if the widget has no tooltip.
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_force_window ##### -->
@@ -166,6 +173,7 @@ care of this.
</para>
@tooltips: a #GtkToolTips
+@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_get_info_from_tip_window ##### -->
@@ -177,5 +185,6 @@ care of this.
@tooltips:
@current_widget:
@Returns:
+@Deprecated: 2.12:
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index c3775ee581..7a4c2cdf4c 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4076,6 +4076,7 @@ gtk_tooltip_trigger_tooltip_query
#if IN_HEADER(__GTK_TOOLTIPS_H__)
#if IN_FILE(__GTK_TOOLTIPS_C__)
+#ifndef GTK_DISABLE_DEPRECATED
gtk_tooltips_data_get
gtk_tooltips_disable
gtk_tooltips_enable
@@ -4083,12 +4084,11 @@ gtk_tooltips_force_window
gtk_tooltips_get_info_from_tip_window
gtk_tooltips_get_type G_GNUC_CONST
gtk_tooltips_new
-#ifndef GTK_DISABLE_DEPRECATED
gtk_tooltips_set_delay
-#endif
gtk_tooltips_set_tip
#endif
#endif
+#endif
#if IN_HEADER(__GTK_TRAY_ICON_H__)
#if IN_FILE(__GTK_TRAY_ICON_X11_C__)
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index df001a8aa7..e3e64720e7 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -775,6 +775,8 @@ _gtk_tooltips_toggle_keyboard_mode (GtkWidget *widget)
* Return value: %TRUE if @tip_window is displaying tooltips, otherwise %FALSE.
*
* Since: 2.4
+ *
+ * Deprecated: 2.12:
**/
gboolean
gtk_tooltips_get_info_from_tip_window (GtkWindow *tip_window,
diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h
index 49dbcbfe47..686eeae27f 100644
--- a/gtk/gtktooltips.h
+++ b/gtk/gtktooltips.h
@@ -24,6 +24,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef GTK_DISABLE_DEPRECATED
+
#ifndef __GTK_TOOLTIPS_H__
#define __GTK_TOOLTIPS_H__
@@ -108,3 +110,5 @@ gboolean gtk_tooltips_get_info_from_tip_window (GtkWindow *tip_window
G_END_DECLS
#endif /* __GTK_TOOLTIPS_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */