X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgmenu.h;h=084b58ac467730e8ea74c556ec799238a938e179;hb=c3842d1969feace4bfb12919be730e75e53877d9;hp=716832f0c1e4f590d107979861e9334527043799;hpb=13f59777350f120dd82d1bd36e15155057b073c3;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gmenu.h b/gio/gmenu.h
index 716832f..084b58a 100644
--- a/gio/gmenu.h
+++ b/gio/gmenu.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see .
*
* Author: Ryan Lortie
*/
@@ -26,105 +24,159 @@
G_BEGIN_DECLS
-#define G_TYPE_MENU (g_menu_get_type ())
-#define G_MENU(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_MENU, GMenu))
-#define G_IS_MENU(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- G_TYPE_MENU))
-
-#define G_TYPE_MENU_ITEM (g_menu_item_get_type ())
-#define G_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_MENU_ITEM, GMenuItem))
-#define G_IS_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- G_TYPE_MENU_ITEM))
-
-typedef struct _GMenuItem GMenuItem;
-typedef struct _GMenu GMenu;
-
-GType g_menu_get_type (void) G_GNUC_CONST;
-GMenu * g_menu_new (void);
-
-void g_menu_freeze (GMenu *menu);
-
-void g_menu_insert_item (GMenu *menu,
- gint position,
- GMenuItem *item);
-void g_menu_prepend_item (GMenu *menu,
- GMenuItem *item);
-void g_menu_append_item (GMenu *menu,
- GMenuItem *item);
-void g_menu_remove (GMenu *menu,
- gint position);
-
-void g_menu_insert (GMenu *menu,
- gint position,
- const gchar *label,
- const gchar *detailed_action);
-void g_menu_prepend (GMenu *menu,
- const gchar *label,
- const gchar *detailed_action);
-void g_menu_append (GMenu *menu,
- const gchar *label,
- const gchar *detailed_action);
-
-void g_menu_insert_section (GMenu *menu,
- gint position,
- const gchar *label,
- GMenuModel *section);
-void g_menu_prepend_section (GMenu *menu,
- const gchar *label,
- GMenuModel *section);
-void g_menu_append_section (GMenu *menu,
- const gchar *label,
- GMenuModel *section);
-
-void g_menu_insert_submenu (GMenu *menu,
- gint position,
- const gchar *label,
- GMenuModel *submenu);
-void g_menu_prepend_submenu (GMenu *menu,
- const gchar *label,
- GMenuModel *submenu);
-void g_menu_append_submenu (GMenu *menu,
- const gchar *label,
- GMenuModel *submenu);
-
-
-GType g_menu_item_get_type (void) G_GNUC_CONST;
-GMenuItem * g_menu_item_new (const gchar *label,
- const gchar *detailed_action);
-
-GMenuItem * g_menu_item_new_submenu (const gchar *label,
- GMenuModel *submenu);
-
-GMenuItem * g_menu_item_new_section (const gchar *label,
- GMenuModel *section);
-
-void g_menu_item_set_attribute_value (GMenuItem *menu_item,
- const char *attribute,
- GVariant *value);
-void g_menu_item_set_attribute (GMenuItem *menu_item,
- const char *attribute,
- const gchar *format_string,
- ...);
-void g_menu_item_set_link (GMenuItem *menu_item,
- const char *link,
- GMenuModel *model);
-void g_menu_item_set_label (GMenuItem *menu_item,
- const gchar *label);
-void g_menu_item_set_submenu (GMenuItem *menu_item,
- GMenuModel *submenu);
-void g_menu_item_set_section (GMenuItem *menu_item,
- GMenuModel *section);
-void g_menu_item_set_action_and_target_value (GMenuItem *menu_item,
- const gchar *action,
- GVariant *target_value);
-void g_menu_item_set_action_and_target (GMenuItem *menu_item,
- const gchar *action,
- const gchar *format_string,
- ...);
-void g_menu_item_set_detailed_action (GMenuItem *menu_item,
- const gchar *detailed_action);
+#define G_TYPE_MENU (g_menu_get_type ())
+#define G_MENU(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ G_TYPE_MENU, GMenu))
+#define G_IS_MENU(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ G_TYPE_MENU))
+
+#define G_TYPE_MENU_ITEM (g_menu_item_get_type ())
+#define G_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ G_TYPE_MENU_ITEM, GMenuItem))
+#define G_IS_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ G_TYPE_MENU_ITEM))
+
+typedef struct _GMenuItem GMenuItem;
+typedef struct _GMenu GMenu;
+
+GLIB_AVAILABLE_IN_2_32
+GType g_menu_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_2_32
+GMenu * g_menu_new (void);
+
+GLIB_AVAILABLE_IN_2_32
+void g_menu_freeze (GMenu *menu);
+
+GLIB_AVAILABLE_IN_2_32
+void g_menu_insert_item (GMenu *menu,
+ gint position,
+ GMenuItem *item);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_prepend_item (GMenu *menu,
+ GMenuItem *item);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_append_item (GMenu *menu,
+ GMenuItem *item);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_remove (GMenu *menu,
+ gint position);
+
+GLIB_AVAILABLE_IN_2_38
+void g_menu_remove_all (GMenu *menu);
+
+GLIB_AVAILABLE_IN_2_32
+void g_menu_insert (GMenu *menu,
+ gint position,
+ const gchar *label,
+ const gchar *detailed_action);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_prepend (GMenu *menu,
+ const gchar *label,
+ const gchar *detailed_action);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_append (GMenu *menu,
+ const gchar *label,
+ const gchar *detailed_action);
+
+GLIB_AVAILABLE_IN_2_32
+void g_menu_insert_section (GMenu *menu,
+ gint position,
+ const gchar *label,
+ GMenuModel *section);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_prepend_section (GMenu *menu,
+ const gchar *label,
+ GMenuModel *section);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_append_section (GMenu *menu,
+ const gchar *label,
+ GMenuModel *section);
+
+GLIB_AVAILABLE_IN_2_32
+void g_menu_insert_submenu (GMenu *menu,
+ gint position,
+ const gchar *label,
+ GMenuModel *submenu);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_prepend_submenu (GMenu *menu,
+ const gchar *label,
+ GMenuModel *submenu);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_append_submenu (GMenu *menu,
+ const gchar *label,
+ GMenuModel *submenu);
+
+
+GLIB_AVAILABLE_IN_2_32
+GType g_menu_item_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_2_32
+GMenuItem * g_menu_item_new (const gchar *label,
+ const gchar *detailed_action);
+
+GLIB_AVAILABLE_IN_2_34
+GMenuItem * g_menu_item_new_from_model (GMenuModel *model,
+ gint item_index);
+
+GLIB_AVAILABLE_IN_2_32
+GMenuItem * g_menu_item_new_submenu (const gchar *label,
+ GMenuModel *submenu);
+
+GLIB_AVAILABLE_IN_2_32
+GMenuItem * g_menu_item_new_section (const gchar *label,
+ GMenuModel *section);
+
+GLIB_AVAILABLE_IN_2_34
+GVariant * g_menu_item_get_attribute_value (GMenuItem *menu_item,
+ const gchar *attribute,
+ const GVariantType *expected_type);
+GLIB_AVAILABLE_IN_2_34
+gboolean g_menu_item_get_attribute (GMenuItem *menu_item,
+ const gchar *attribute,
+ const gchar *format_string,
+ ...);
+GLIB_AVAILABLE_IN_2_34
+GMenuModel *g_menu_item_get_link (GMenuItem *menu_item,
+ const gchar *link);
+
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_attribute_value (GMenuItem *menu_item,
+ const gchar *attribute,
+ GVariant *value);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_attribute (GMenuItem *menu_item,
+ const gchar *attribute,
+ const gchar *format_string,
+ ...);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_link (GMenuItem *menu_item,
+ const gchar *link,
+ GMenuModel *model);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_label (GMenuItem *menu_item,
+ const gchar *label);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_submenu (GMenuItem *menu_item,
+ GMenuModel *submenu);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_section (GMenuItem *menu_item,
+ GMenuModel *section);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_action_and_target_value (GMenuItem *menu_item,
+ const gchar *action,
+ GVariant *target_value);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_action_and_target (GMenuItem *menu_item,
+ const gchar *action,
+ const gchar *format_string,
+ ...);
+GLIB_AVAILABLE_IN_2_32
+void g_menu_item_set_detailed_action (GMenuItem *menu_item,
+ const gchar *detailed_action);
+
+GLIB_AVAILABLE_IN_2_38
+void g_menu_item_set_icon (GMenuItem *menu_item,
+ GIcon *icon);
+
G_END_DECLS
#endif /* __G_MENU_H__ */