[gtk+/wip/ebassi/combo: 16/16] Use 3.18 symbol annotations for GtkOptionButton and List
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/ebassi/combo: 16/16] Use 3.18 symbol annotations for GtkOptionButton and List
- Date: Mon, 10 Aug 2015 12:16:58 +0000 (UTC)
commit 87665ba380db56501645dc682d69003b37078a43
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Aug 10 12:56:48 2015 +0100
Use 3.18 symbol annotations for GtkOptionButton and List
We missed the window for 3.16.
gtk/gtkoptionbutton.c | 6 +-
gtk/gtkoptionbutton.h | 40 +++++++-------
gtk/gtkoptionlist.c | 34 ++++++------
gtk/gtkoptionlist.h | 142 ++++++++++++++++++++++++------------------------
4 files changed, 111 insertions(+), 111 deletions(-)
---
diff --git a/gtk/gtkoptionbutton.c b/gtk/gtkoptionbutton.c
index cb139b1..2cd2056 100644
--- a/gtk/gtkoptionbutton.c
+++ b/gtk/gtkoptionbutton.c
@@ -216,7 +216,7 @@ selected_changed (GObject *list,
*
* Returns: A new #GtkOptionButton
*
- * Since: 3.16
+ * Since: 3.18
*/
GtkWidget *
gtk_option_button_new (void)
@@ -240,7 +240,7 @@ gtk_option_button_get_option_list (GtkOptionButton *button)
* Sets the placeholder text that is displayed in the button
* if no item is currently selected.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_button_set_placeholder_text (GtkOptionButton *button,
@@ -273,7 +273,7 @@ gtk_option_button_set_placeholder_text (GtkOptionButton *button,
*
* Returns: (transfer none): the placeholder text
*
- * Since: 3.16
+ * Since: 3.18
*/
const gchar *
gtk_option_button_get_placeholder_text (GtkOptionButton *button)
diff --git a/gtk/gtkoptionbutton.h b/gtk/gtkoptionbutton.h
index 58ffe31..c7adbd9 100644
--- a/gtk/gtkoptionbutton.h
+++ b/gtk/gtkoptionbutton.h
@@ -19,7 +19,7 @@
#ifndef __GTK_OPTION_BUTTON_H__
#define __GTK_OPTION_BUTTON_H__
-#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
@@ -27,30 +27,30 @@
G_BEGIN_DECLS
-#define GTK_TYPE_OPTION_BUTTON (gtk_option_button_get_type ())
-#define GTK_OPTION_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_BUTTON,
GtkOptionButton))
-#define GTK_OPTION_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_BUTTON,
GtkOptionButtonClass))
-#define GTK_IS_OPTION_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_BUTTON))
-#define GTK_IS_OPTION_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_BUTTON))
-#define GTK_OPTION_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_BUTTON,
GtkOptionButtonClass))
+#define GTK_TYPE_OPTION_BUTTON (gtk_option_button_get_type ())
+#define GTK_OPTION_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_BUTTON,
GtkOptionButton))
+#define GTK_OPTION_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_BUTTON,
GtkOptionButtonClass))
+#define GTK_IS_OPTION_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_BUTTON))
+#define GTK_IS_OPTION_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_BUTTON))
+#define GTK_OPTION_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_BUTTON,
GtkOptionButtonClass))
-typedef struct _GtkOptionButton GtkOptionButton;
-typedef struct _GtkOptionButtonClass GtkOptionButtonClass;
+typedef struct _GtkOptionButton GtkOptionButton;
+typedef struct _GtkOptionButtonClass GtkOptionButtonClass;
-GDK_AVAILABLE_IN_3_16
-GType gtk_option_button_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_3_18
+GType gtk_option_button_get_type (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_3_16
-GtkWidget * gtk_option_button_new (void);
+GDK_AVAILABLE_IN_3_18
+GtkWidget * gtk_option_button_new (void);
-GDK_AVAILABLE_IN_3_16
-GtkWidget * gtk_option_button_get_option_list (GtkOptionButton *button);
+GDK_AVAILABLE_IN_3_18
+GtkWidget * gtk_option_button_get_option_list (GtkOptionButton *button);
-GDK_AVAILABLE_IN_3_16
-void gtk_option_button_set_placeholder_text (GtkOptionButton *button,
- const gchar *text);
-GDK_AVAILABLE_IN_3_16
-const gchar * gtk_option_button_get_placeholder_text (GtkOptionButton *button);
+GDK_AVAILABLE_IN_3_18
+void gtk_option_button_set_placeholder_text (GtkOptionButton *button,
+ const gchar *text);
+GDK_AVAILABLE_IN_3_18
+const gchar * gtk_option_button_get_placeholder_text (GtkOptionButton *button);
G_END_DECLS
diff --git a/gtk/gtkoptionlist.c b/gtk/gtkoptionlist.c
index bee1d3c..e2b6e5b 100644
--- a/gtk/gtkoptionlist.c
+++ b/gtk/gtkoptionlist.c
@@ -1482,7 +1482,7 @@ ensure_group (GtkOptionList *ol,
*
* Returns: A new #GtkOptionList
*
- * Since: 3.16
+ * Since: 3.18
*/
GtkWidget *
gtk_option_list_new (void)
@@ -1499,7 +1499,7 @@ gtk_option_list_new (void)
* Returns: (transfer none): the IDs of the selected items, as
* a %NULL-terminated array of strings.
*
- * Since: 3.16
+ * Since: 3.18
*/
const gchar **
gtk_option_list_get_selected_items (GtkOptionList *list)
@@ -1614,7 +1614,7 @@ set_selected (GtkOptionList *ol,
* on the seleciton mode, this may cause other
* items to be deselected.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_select_item (GtkOptionList *list,
@@ -1660,7 +1660,7 @@ gtk_option_list_select_item (GtkOptionList *list,
* on the seleciton mode, this may or may not be
* possible.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_unselect_item (GtkOptionList *list,
@@ -1706,7 +1706,7 @@ gtk_option_list_unselect_item (GtkOptionList *list,
* If an item with this ID already exists, its display text
* will be updated with the new values.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_add_item (GtkOptionList *list,
@@ -1746,7 +1746,7 @@ gtk_option_list_add_item (GtkOptionList *list,
*
* Returns: the display text for @id, or %NULL
*
- * Since: 3.16
+ * Since: 3.18
*/
const gchar *
gtk_option_list_item_get_text (GtkOptionList *list,
@@ -1773,7 +1773,7 @@ gtk_option_list_item_get_text (GtkOptionList *list,
* If no sort key is set, items are sorted according to
* their display text.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_item_set_sort_key (GtkOptionList *list,
@@ -1805,7 +1805,7 @@ gtk_option_list_item_set_sort_key (GtkOptionList *list,
* Places the item identified by @id in a group.
* By default, items are not grouped.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_item_set_group_key (GtkOptionList *list,
@@ -1847,7 +1847,7 @@ gtk_option_list_item_set_group_key (GtkOptionList *list,
* If the removed item was the last one in its group,
* the group will be removed as well.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_remove_item (GtkOptionList *list,
@@ -1868,7 +1868,7 @@ gtk_option_list_remove_item (GtkOptionList *list,
* Sets whether the list should allow the user
* to enter custom values.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_set_allow_custom (GtkOptionList *list,
@@ -1893,7 +1893,7 @@ gtk_option_list_set_allow_custom (GtkOptionList *list,
*
* Returns: %TRUE if custom values are allowed
*
- * Since: 3.16
+ * Since: 3.18
*/
gboolean
gtk_option_list_get_allow_custom (GtkOptionList *list)
@@ -1910,7 +1910,7 @@ gtk_option_list_get_allow_custom (GtkOptionList *list)
*
* Sets the text that is displayed for the custom entry.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_set_custom_text (GtkOptionList *list,
@@ -1932,7 +1932,7 @@ gtk_option_list_set_custom_text (GtkOptionList *list,
*
* Returns: (transfer none): the custom text
*
- * Since: 3.16
+ * Since: 3.18
*/
const gchar *
gtk_option_list_get_custom_text (GtkOptionList *list)
@@ -1951,7 +1951,7 @@ gtk_option_list_get_custom_text (GtkOptionList *list)
*
* Associates a display text and sort key with a group of items.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_add_group (GtkOptionList *list,
@@ -1990,7 +1990,7 @@ gtk_option_list_add_group (GtkOptionList *list,
* Note that #GTK_SELECTION_NONE does not make sense
* for option lists.
*
- * Since: 3.16
+ * Since: 3.18
*/
void
gtk_option_list_set_selection_mode (GtkOptionList *list,
@@ -2015,7 +2015,7 @@ gtk_option_list_set_selection_mode (GtkOptionList *list,
*
* Returns: the selection mode
*
- * Since: 3.16
+ * Since: 3.18
*/
GtkSelectionMode
gtk_option_list_get_selection_mode (GtkOptionList *list)
@@ -2042,7 +2042,7 @@ gtk_option_list_get_selection_mode (GtkOptionList *list)
* in text being entered in the search entry,
* %GDK_EVENT_PROPAGATE otherwise.
*
- * Since: 3.16
+ * Since: 3.18
*/
gboolean
gtk_option_list_handle_key_event (GtkOptionList *list,
diff --git a/gtk/gtkoptionlist.h b/gtk/gtkoptionlist.h
index ccfc923..3ccf245 100644
--- a/gtk/gtkoptionlist.h
+++ b/gtk/gtkoptionlist.h
@@ -19,7 +19,7 @@
#ifndef __GTK_OPTION_LIST_H__
#define __GTK_OPTION_LIST_H__
-#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
@@ -27,80 +27,80 @@
G_BEGIN_DECLS
-#define GTK_TYPE_OPTION_LIST (gtk_option_list_get_type ())
-#define GTK_OPTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_LIST,
GtkOptionList))
-#define GTK_OPTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_LIST,
GtkOptionListClass))
-#define GTK_IS_OPTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_LIST))
-#define GTK_IS_OPTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_LIST))
-#define GTK_OPTION_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_LIST,
GtkOptionListClass))
+#define GTK_TYPE_OPTION_LIST (gtk_option_list_get_type ())
+#define GTK_OPTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_LIST,
GtkOptionList))
+#define GTK_OPTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_LIST,
GtkOptionListClass))
+#define GTK_IS_OPTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_LIST))
+#define GTK_IS_OPTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_LIST))
+#define GTK_OPTION_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_LIST,
GtkOptionListClass))
typedef struct _GtkOptionList GtkOptionList;
typedef struct _GtkOptionListClass GtkOptionListClass;
-GDK_AVAILABLE_IN_3_16
-GType gtk_option_list_get_type (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_3_16
-GtkWidget * gtk_option_list_new (void);
-
-GDK_AVAILABLE_IN_3_16
-const gchar ** gtk_option_list_get_selected_items (GtkOptionList *list);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_select_item (GtkOptionList *list,
- const gchar *id);
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_unselect_item (GtkOptionList *list,
- const gchar *id);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_add_item (GtkOptionList *list,
- const gchar *id,
- const gchar *text);
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_remove_item (GtkOptionList *list,
- const gchar *id);
-
-GDK_AVAILABLE_IN_3_16
-const gchar * gtk_option_list_item_get_text (GtkOptionList *list,
- const gchar *id);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_item_set_sort_key (GtkOptionList *list,
- const gchar *id,
- const gchar *sort);
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_item_set_group_key (GtkOptionList *list,
- const gchar *id,
- const gchar *group);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_add_group (GtkOptionList *list,
- const gchar *group,
- const gchar *text,
- const gchar *sort);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_set_allow_custom (GtkOptionList *list,
- gboolean allow);
-GDK_AVAILABLE_IN_3_16
-gboolean gtk_option_list_get_allow_custom (GtkOptionList *list);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_set_custom_text (GtkOptionList *list,
- const gchar *text);
-GDK_AVAILABLE_IN_3_16
-const gchar * gtk_option_list_get_custom_text (GtkOptionList *list);
-
-GDK_AVAILABLE_IN_3_16
-void gtk_option_list_set_selection_mode (GtkOptionList *list,
- GtkSelectionMode mode);
-GDK_AVAILABLE_IN_3_16
-GtkSelectionMode gtk_option_list_get_selection_mode (GtkOptionList *list);
-
-GDK_AVAILABLE_IN_3_16
-gboolean gtk_option_list_handle_key_event (GtkOptionList *list,
- GdkEvent *event);
+GDK_AVAILABLE_IN_3_18
+GType gtk_option_list_get_type (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_3_18
+GtkWidget * gtk_option_list_new (void);
+
+GDK_AVAILABLE_IN_3_18
+const gchar ** gtk_option_list_get_selected_items (GtkOptionList *list);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_select_item (GtkOptionList *list,
+ const gchar *id);
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_unselect_item (GtkOptionList *list,
+ const gchar *id);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_add_item (GtkOptionList *list,
+ const gchar *id,
+ const gchar *text);
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_remove_item (GtkOptionList *list,
+ const gchar *id);
+
+GDK_AVAILABLE_IN_3_18
+const gchar * gtk_option_list_item_get_text (GtkOptionList *list,
+ const gchar *id);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_item_set_sort_key (GtkOptionList *list,
+ const gchar *id,
+ const gchar *sort);
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_item_set_group_key (GtkOptionList *list,
+ const gchar *id,
+ const gchar *group);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_add_group (GtkOptionList *list,
+ const gchar *group,
+ const gchar *text,
+ const gchar *sort);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_set_allow_custom (GtkOptionList *list,
+ gboolean allow);
+GDK_AVAILABLE_IN_3_18
+gboolean gtk_option_list_get_allow_custom (GtkOptionList *list);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_set_custom_text (GtkOptionList *list,
+ const gchar *text);
+GDK_AVAILABLE_IN_3_18
+const gchar * gtk_option_list_get_custom_text (GtkOptionList *list);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_option_list_set_selection_mode (GtkOptionList *list,
+ GtkSelectionMode mode);
+GDK_AVAILABLE_IN_3_18
+GtkSelectionMode gtk_option_list_get_selection_mode (GtkOptionList *list);
+
+GDK_AVAILABLE_IN_3_18
+gboolean gtk_option_list_handle_key_event (GtkOptionList *list,
+ GdkEvent *event);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
